diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-23 21:24:37 -0700 |
---|---|---|
committer | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-23 21:24:37 -0700 |
commit | 0c0d54637af7109ae22e21a117dba3efdaded4b5 (patch) | |
tree | fe9ed94353b09dda232fceb64691f96dcd5db8d3 /src/com/android/launcher3/PreloadIconDrawable.java | |
parent | cf51139c6e1d57b57177109f2177edc41edf5bbc (diff) | |
parent | 13ef17a37e683b8ad5800e9f542b411180fbec2f (diff) | |
download | android_packages_apps_Trebuchet-0c0d54637af7109ae22e21a117dba3efdaded4b5.tar.gz android_packages_apps_Trebuchet-0c0d54637af7109ae22e21a117dba3efdaded4b5.tar.bz2 android_packages_apps_Trebuchet-0c0d54637af7109ae22e21a117dba3efdaded4b5.zip |
resolved conflicts for merge of 13ef17a3 to mnc-ub-dev
b/22609402
Change-Id: I80699d985088b9b79211284e710e8a6b8b90860b
Diffstat (limited to 'src/com/android/launcher3/PreloadIconDrawable.java')
-rw-r--r-- | src/com/android/launcher3/PreloadIconDrawable.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/launcher3/PreloadIconDrawable.java b/src/com/android/launcher3/PreloadIconDrawable.java index 2972c4f9b..bcb59c448 100644 --- a/src/com/android/launcher3/PreloadIconDrawable.java +++ b/src/com/android/launcher3/PreloadIconDrawable.java @@ -54,12 +54,11 @@ class PreloadIconDrawable extends Drawable { mPaint.setStrokeCap(Paint.Cap.ROUND); setBounds(icon.getBounds()); - applyTheme(theme); + applyPreloaderTheme(theme); onLevelChange(0); } - @Override - public void applyTheme(Theme t) { + public void applyPreloaderTheme(Theme t) { TypedArray ta = t.obtainStyledAttributes(R.styleable.PreloadIconDrawable); mBgDrawable = ta.getDrawable(R.styleable.PreloadIconDrawable_background); mBgDrawable.setFilterBitmap(true); |