diff options
author | Daniel Sandler <dsandler@android.com> | 2013-08-06 17:08:09 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-06 17:08:09 +0000 |
commit | cff295f8b7d48234e646999e02127750ba9b138b (patch) | |
tree | b3ad9c7c14599679fc901f67ec4449750913802a | |
parent | 695ff6b6fada4e1037592d7c4961321e12890b7d (diff) | |
parent | 24ad0f0aad174b077e80b10d1f814ff9e9eb92e4 (diff) | |
download | android_packages_apps_Trebuchet-cff295f8b7d48234e646999e02127750ba9b138b.tar.gz android_packages_apps_Trebuchet-cff295f8b7d48234e646999e02127750ba9b138b.tar.bz2 android_packages_apps_Trebuchet-cff295f8b7d48234e646999e02127750ba9b138b.zip |
Merge "Remove unnecessary FolderRing bitmaps." into jb-ub-gel-agar
-rw-r--r-- | src/com/android/launcher3/FolderIcon.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/launcher3/FolderIcon.java b/src/com/android/launcher3/FolderIcon.java index 92f126c3f..fa713a41a 100644 --- a/src/com/android/launcher3/FolderIcon.java +++ b/src/com/android/launcher3/FolderIcon.java @@ -27,6 +27,7 @@ import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.Rect; import android.graphics.drawable.Drawable; +import android.os.Looper; import android.os.Parcelable; import android.util.AttributeSet; import android.view.LayoutInflater; @@ -167,8 +168,6 @@ public class FolderIcon extends LinearLayout implements FolderListener { public float mOuterRingSize; public float mInnerRingSize; public FolderIcon mFolderIcon = null; - public Drawable mOuterRingDrawable = null; - public Drawable mInnerRingDrawable = null; public static Drawable sSharedOuterRingDrawable = null; public static Drawable sSharedInnerRingDrawable = null; public static int sPreviewSize = -1; @@ -180,12 +179,14 @@ public class FolderIcon extends LinearLayout implements FolderListener { public FolderRingAnimator(Launcher launcher, FolderIcon folderIcon) { mFolderIcon = folderIcon; Resources res = launcher.getResources(); - mOuterRingDrawable = res.getDrawable(R.drawable.portal_ring_outer_holo); - mInnerRingDrawable = res.getDrawable(R.drawable.portal_ring_inner_holo); // We need to reload the static values when configuration changes in case they are // different in another configuration if (sStaticValuesDirty) { + if (Looper.myLooper() != Looper.getMainLooper()) { + throw new RuntimeException("FolderRingAnimator loading drawables on non-UI thread " + + Thread.currentThread()); + } sPreviewSize = res.getDimensionPixelSize(R.dimen.folder_preview_size); sPreviewPadding = res.getDimensionPixelSize(R.dimen.folder_preview_padding); sSharedOuterRingDrawable = res.getDrawable(R.drawable.portal_ring_outer_holo); |