From df6af5740da6ee9f78e846218d71941b02fc0283 Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Wed, 19 Oct 2011 14:38:16 -0700 Subject: [PATCH] Fix NPE when opening a new folder if there were no folders before (issue 5482523) Change-Id: I41fa39c4766f052c785c7e5635c8243e34af84fc --- src/com/android/launcher2/FolderIcon.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/com/android/launcher2/FolderIcon.java b/src/com/android/launcher2/FolderIcon.java index cde5d947fc..894507659b 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; } }