Fix some use of deprecated APIs in Support7Demos.
Bug: 31017538
Change-Id: Ibcc32cd866e7bf469159ef741c71a61c2c88e379
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/graphics/PaletteActivity.java b/samples/Support7Demos/src/com/example/android/supportv7/graphics/PaletteActivity.java
index 0759e33..0a99787 100644
--- a/samples/Support7Demos/src/com/example/android/supportv7/graphics/PaletteActivity.java
+++ b/samples/Support7Demos/src/com/example/android/supportv7/graphics/PaletteActivity.java
@@ -16,8 +16,6 @@
package com.example.android.supportv7.graphics;
-import com.example.android.supportv7.R;
-
import android.content.Context;
import android.content.Intent;
import android.database.Cursor;
@@ -40,6 +38,8 @@
import android.widget.ImageView;
import android.widget.ListView;
+import com.example.android.supportv7.R;
+
/**
* Activity which displays the images from the device's {@link MediaStore}, alongside the generated
* {@link android.support.v7.graphics.Palette} results.
@@ -204,7 +204,7 @@
ImageLoader.loadMediaStoreThumbnail(imageView, id, new ImageLoader.Listener() {
@Override
public void onImageLoaded(Bitmap bitmap) {
- Palette.generateAsync(bitmap, mNumColors,
+ new Palette.Builder(bitmap).maximumColorCount(mNumColors).generate(
new Palette.PaletteAsyncListener() {
@Override
public void onGenerated(Palette palette) {
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/graphics/PaletteDetailActivity.java b/samples/Support7Demos/src/com/example/android/supportv7/graphics/PaletteDetailActivity.java
index d7fd47c..794863b 100644
--- a/samples/Support7Demos/src/com/example/android/supportv7/graphics/PaletteDetailActivity.java
+++ b/samples/Support7Demos/src/com/example/android/supportv7/graphics/PaletteDetailActivity.java
@@ -126,12 +126,13 @@
ImageLoader.loadMediaStoreThumbnail(mImageView, id, new ImageLoader.Listener() {
@Override
public void onImageLoaded(Bitmap bitmap) {
- Palette.generateAsync(bitmap, numColors, new Palette.PaletteAsyncListener() {
- @Override
- public void onGenerated(Palette palette) {
- populatePalette(palette);
- }
- });
+ new Palette.Builder(bitmap).maximumColorCount(numColors).generate(
+ new Palette.PaletteAsyncListener() {
+ @Override
+ public void onGenerated(Palette palette) {
+ populatePalette(palette);
+ }
+ });
}
});
}
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/media/OverlayDisplayWindow.java b/samples/Support7Demos/src/com/example/android/supportv7/media/OverlayDisplayWindow.java
index 1d4aaa1..65a7ca2 100644
--- a/samples/Support7Demos/src/com/example/android/supportv7/media/OverlayDisplayWindow.java
+++ b/samples/Support7Demos/src/com/example/android/supportv7/media/OverlayDisplayWindow.java
@@ -102,6 +102,7 @@
/**
* Implementation for older versions.
*/
+ @SuppressWarnings("deprecation") // Intentionally using deprecated APIs for pre JB MR1 devices.
private static final class LegacyImpl extends OverlayDisplayWindow {
private final WindowManager mWindowManager;
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/view/CardViewActivity.java b/samples/Support7Demos/src/com/example/android/supportv7/view/CardViewActivity.java
index cc70442..0722ebda 100644
--- a/samples/Support7Demos/src/com/example/android/supportv7/view/CardViewActivity.java
+++ b/samples/Support7Demos/src/com/example/android/supportv7/view/CardViewActivity.java
@@ -17,6 +17,7 @@
import android.os.Bundle;
import android.os.Handler;
+import android.support.v4.content.ContextCompat;
import android.support.v4.view.ViewCompat;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.CardView;
@@ -161,7 +162,8 @@
@Override
public void onCheckedChanged(RadioGroup group, int checkedId) {
mCardView.setCardBackgroundColor(
- getResources().getColorStateList(getColorId(checkedId)));
+ ContextCompat.getColorStateList(CardViewActivity.this,
+ getColorId(checkedId)));
}
});
}
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/widget/DrawerLayoutActivity.java b/samples/Support7Demos/src/com/example/android/supportv7/widget/DrawerLayoutActivity.java
index 55ad19d..c53ec8f 100644
--- a/samples/Support7Demos/src/com/example/android/supportv7/widget/DrawerLayoutActivity.java
+++ b/samples/Support7Demos/src/com/example/android/supportv7/widget/DrawerLayoutActivity.java
@@ -20,6 +20,7 @@
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.os.Bundle;
+import android.support.v4.content.ContextCompat;
import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle;
@@ -146,7 +147,7 @@
// Configure the background color fill of the system status bar (on supported platform
// versions) and the toolbar itself. We're using the same color, and android:statusBar
// from the theme makes the status bar slightly darker.
- final int metalBlueColor = getResources().getColor(R.color.drawer_sample_metal_blue);
+ final int metalBlueColor = ContextCompat.getColor(this, R.color.drawer_sample_metal_blue);
mDrawerLayout.setStatusBarBackgroundColor(metalBlueColor);
mToolbar.setBackgroundColor(metalBlueColor);
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/widget/touch/DragAndDropActivity.java b/samples/Support7Demos/src/com/example/android/supportv7/widget/touch/DragAndDropActivity.java
index 7f9f7e5..7daa3eb 100644
--- a/samples/Support7Demos/src/com/example/android/supportv7/widget/touch/DragAndDropActivity.java
+++ b/samples/Support7Demos/src/com/example/android/supportv7/widget/touch/DragAndDropActivity.java
@@ -21,6 +21,7 @@
import android.annotation.TargetApi;
import android.os.Build;
+import android.support.v4.content.ContextCompat;
import android.support.v4.view.MotionEventCompat;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.helper.ItemTouchHelper;
@@ -89,7 +90,8 @@
public void clearView(RecyclerView.ViewHolder viewHolder) {
super.clearView(viewHolder);
ItemTouchViewHolder touchVH = (ItemTouchViewHolder) viewHolder;
- touchVH.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.white));
+ touchVH.cardView.setCardBackgroundColor(
+ ContextCompat.getColor(this, android.R.color.white));
touchVH.overlay.setVisibility(View.GONE);
}
@@ -97,7 +99,8 @@
public void onSelectedChanged(RecyclerView.ViewHolder viewHolder, int actionState) {
ItemTouchViewHolder touchVH = (ItemTouchViewHolder) viewHolder;
if (actionState != ItemTouchHelper.ACTION_STATE_IDLE) {
- touchVH.cardView.setCardBackgroundColor(getResources().getColor(R.color.card_aquatic));
+ touchVH.cardView.setCardBackgroundColor(
+ ContextCompat.getColor(this, R.color.card_aquatic));
}
super.onSelectedChanged(viewHolder, actionState);
}
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java b/samples/Support7Demos/src/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java
index bb7e27e..7444c23 100644
--- a/samples/Support7Demos/src/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java
+++ b/samples/Support7Demos/src/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java
@@ -22,6 +22,7 @@
import android.annotation.TargetApi;
import android.graphics.Canvas;
import android.os.Build;
+import android.support.v4.content.ContextCompat;
import android.support.v4.view.MotionEventCompat;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.helper.ItemTouchHelper;
@@ -103,7 +104,8 @@
public void clearView(RecyclerView.ViewHolder viewHolder) {
super.clearView(viewHolder);
ItemTouchViewHolder touchVH = (ItemTouchViewHolder) viewHolder;
- touchVH.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.white));
+ touchVH.cardView.setCardBackgroundColor(
+ ContextCompat.getColor(this, android.R.color.white));
touchVH.overlay.setVisibility(View.GONE);
}
@@ -112,7 +114,8 @@
public void onSelectedChanged(RecyclerView.ViewHolder viewHolder, int actionState) {
ItemTouchViewHolder touchVH = (ItemTouchViewHolder) viewHolder;
if (actionState != ItemTouchHelper.ACTION_STATE_IDLE) {
- touchVH.cardView.setCardBackgroundColor(getResources().getColor(R.color.card_aquatic));
+ touchVH.cardView.setCardBackgroundColor(
+ ContextCompat.getColor(this, R.color.card_aquatic));
if (mCustomSwipeEnabled) {
// hide it
touchVH.overlay.setTranslationX(viewHolder.itemView.getWidth());
