diff options
| author | Jon Miranda <jonmiranda@google.com> | 2016-09-15 15:05:12 -0700 |
|---|---|---|
| committer | Jon Miranda <jonmiranda@google.com> | 2016-09-15 15:05:12 -0700 |
| commit | 488d8adeb822a5aa88be46edb8a5e779b540b972 (patch) | |
| tree | 2a7b06e3d2cc2f45fb628ad0b5fce5e1d95aa631 /src | |
| parent | 9784572c47b414d1a707e5e29e48165e24b1d742 (diff) | |
| download | android_packages_apps_Trebuchet-488d8adeb822a5aa88be46edb8a5e779b540b972.tar.gz android_packages_apps_Trebuchet-488d8adeb822a5aa88be46edb8a5e779b540b972.tar.bz2 android_packages_apps_Trebuchet-488d8adeb822a5aa88be46edb8a5e779b540b972.zip | |
Use ContextCompat.getColor to support API levels below 23.
Found while debugging on Lollipop.
Change-Id: Ibe97fd30c4ee8cd0c1735a41802b859345f9e931
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Hotseat.java | 3 | ||||
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsTransitionController.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java index c738480fe..f9424d483 100644 --- a/src/com/android/launcher3/Hotseat.java +++ b/src/com/android/launcher3/Hotseat.java @@ -25,6 +25,7 @@ import android.graphics.Color; import android.graphics.Rect; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; +import android.support.v4.content.ContextCompat; import android.support.v4.graphics.ColorUtils; import android.util.AttributeSet; import android.view.LayoutInflater; @@ -69,7 +70,7 @@ public class Hotseat extends FrameLayout mLauncher = (Launcher) context; mHasVerticalHotseat = mLauncher.getDeviceProfile().isVerticalBarLayout(); mBackgroundColor = ColorUtils.setAlphaComponent( - context.getColor(R.color.all_apps_container_color), 0); + ContextCompat.getColor(context, R.color.all_apps_container_color), 0); mBackground = new ColorDrawable(mBackgroundColor); setBackground(mBackground); } diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index 588823051..9fcc6a40e 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java @@ -6,6 +6,7 @@ import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; import android.animation.ArgbEvaluator; import android.animation.ObjectAnimator; +import android.support.v4.content.ContextCompat; import android.support.v4.view.animation.FastOutSlowInInterpolator; import android.util.Log; import android.view.MotionEvent; @@ -101,7 +102,7 @@ public class AllAppsTransitionController implements TouchController, VerticalPul R.dimen.all_apps_bezel_swipe_height); mEvaluator = new ArgbEvaluator(); - mAllAppsBackgroundColor = l.getColor(R.color.all_apps_container_color); + mAllAppsBackgroundColor = ContextCompat.getColor(l, R.color.all_apps_container_color); } @Override |