diff options
author | Adam Cohen <adamcohen@google.com> | 2011-10-19 15:14:42 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-19 15:14:42 -0700 |
commit | a8c462b3415719e2ef67d900fd21a899bcf63491 (patch) | |
tree | 8dca42f88d8f1d45ee707553bbdc6f5188b0faf0 /src | |
parent | 27bfb1ba95aa6fc31a77e670a6cb412eb5cf5775 (diff) | |
parent | df6af5740da6ee9f78e846218d71941b02fc0283 (diff) | |
download | android_packages_apps_Trebuchet-a8c462b3415719e2ef67d900fd21a899bcf63491.tar.gz android_packages_apps_Trebuchet-a8c462b3415719e2ef67d900fd21a899bcf63491.tar.bz2 android_packages_apps_Trebuchet-a8c462b3415719e2ef67d900fd21a899bcf63491.zip |
am df6af574: Fix NPE when opening a new folder if there were no folders before (issue 5482523)
* commit 'df6af5740da6ee9f78e846218d71941b02fc0283':
Fix NPE when opening a new folder if there were no folders before (issue 5482523)
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher2/FolderIcon.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/com/android/launcher2/FolderIcon.java b/src/com/android/launcher2/FolderIcon.java index cde5d947f..894507659 100644 --- a/src/com/android/launcher2/FolderIcon.java +++ b/src/com/android/launcher2/FolderIcon.java @@ -136,12 +136,6 @@ public class FolderIcon extends LinearLayout implements FolderListener { icon.mFolder = folder; Resources res = launcher.getResources(); - // We need to reload the static values when configuration changes in case they are - // different in another configuration - if (sStaticValuesDirty) { - sSharedFolderLeaveBehind = res.getDrawable(R.drawable.portal_ring_rest); - } - icon.mFolderRingAnimator = new FolderRingAnimator(launcher, icon); folderInfo.addListener(icon); @@ -184,6 +178,7 @@ public class FolderIcon extends LinearLayout implements FolderListener { sPreviewPadding = res.getDimensionPixelSize(R.dimen.folder_preview_padding); sSharedOuterRingDrawable = res.getDrawable(R.drawable.portal_ring_outer_holo); sSharedInnerRingDrawable = res.getDrawable(R.drawable.portal_ring_inner_holo); + sSharedFolderLeaveBehind = res.getDrawable(R.drawable.portal_ring_rest); sStaticValuesDirty = false; } } |