diff options
author | Adam Cohen <adamcohen@google.com> | 2011-10-19 14:38:16 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2011-10-19 14:38:16 -0700 |
commit | df6af5740da6ee9f78e846218d71941b02fc0283 (patch) | |
tree | 97686f140e1442665379ea3b022e2e06d7fa26af /src/com/android/launcher2 | |
parent | d3357b186d55816e682b3012cfccd2d7a0680678 (diff) | |
download | android_packages_apps_Trebuchet-df6af5740da6ee9f78e846218d71941b02fc0283.tar.gz android_packages_apps_Trebuchet-df6af5740da6ee9f78e846218d71941b02fc0283.tar.bz2 android_packages_apps_Trebuchet-df6af5740da6ee9f78e846218d71941b02fc0283.zip |
Fix NPE when opening a new folder if there were no folders before (issue 5482523)
Change-Id: I41fa39c4766f052c785c7e5635c8243e34af84fc
Diffstat (limited to 'src/com/android/launcher2')
-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; } } |