summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2015-06-09 19:55:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-09 19:55:30 +0000
commit93f6fe959446b5bcba4bac44b37d0306dd4546e5 (patch)
tree1564da6504e0e60abbb66eb533089aa93946fcf7 /packages
parentf17138f068af9f89d760b4c0f33c0a32a267d849 (diff)
parentf5b1f0442770325e804f6b094b8527e026149987 (diff)
downloadframeworks_base-93f6fe959446b5bcba4bac44b37d0306dd4546e5.zip
frameworks_base-93f6fe959446b5bcba4bac44b37d0306dd4546e5.tar.gz
frameworks_base-93f6fe959446b5bcba4bac44b37d0306dd4546e5.tar.bz2
Merge "Fix horrible warning on every systemui startup." into mnc-dev
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/DismissViewButton.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/DismissViewButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/DismissViewButton.java
index 00665f4..a323684 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/DismissViewButton.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/DismissViewButton.java
@@ -48,15 +48,14 @@ public class DismissViewButton extends Button {
public DismissViewButton(Context context, AttributeSet attrs, int defStyleAttr,
int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
- mAnimatedDismissDrawable = (AnimatedVectorDrawable) getContext().getResources().getDrawable(
+ mAnimatedDismissDrawable = (AnimatedVectorDrawable) getContext().getDrawable(
R.drawable.dismiss_all_shape_animation).mutate();
mAnimatedDismissDrawable.setCallback(this);
mAnimatedDismissDrawable.setBounds(0,
0,
mAnimatedDismissDrawable.getIntrinsicWidth(),
mAnimatedDismissDrawable.getIntrinsicHeight());
- mStaticDismissDrawable = getContext().getResources().getDrawable(
- R.drawable.dismiss_all_shape);
+ mStaticDismissDrawable = getContext().getDrawable(R.drawable.dismiss_all_shape);
mStaticDismissDrawable.setBounds(0,
0,
mStaticDismissDrawable.getIntrinsicWidth(),