PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am df6af574: Fix NPE when opening a new folder if there were no folders before (issue 5482523)

Browse Source 
* commit 'df6af5740da6ee9f78e846218d71941b02fc0283':
  Fix NPE when opening a new folder if there were no folders before (issue 5482523)
This commit is contained in:
Adam Cohen
2011-10-19 15:14:42 -07:00
committed by Android Git Automerger
parent 27bfb1ba95 df6af5740d
commit a8c462b341
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/FolderIcon.java
+1 -6
View File
@@ -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;
}
}