diff options
author | Daniel Sandler <dsandler@android.com> | 2013-06-11 14:45:48 -0400 |
---|---|---|
committer | Daniel Sandler <dsandler@android.com> | 2013-06-11 22:01:47 -0400 |
commit | cc8befac3550c81d04ea206c170adae36c9a6c93 (patch) | |
tree | 844f01e8fe09b157fb39d74b3195e934a3e6a271 /src/com/android/launcher3/Folder.java | |
parent | ecf33e4819d0c4b019706edd456ed14a6a0f200c (diff) | |
download | android_packages_apps_Trebuchet-cc8befac3550c81d04ea206c170adae36c9a6c93.tar.gz android_packages_apps_Trebuchet-cc8befac3550c81d04ea206c170adae36c9a6c93.tar.bz2 android_packages_apps_Trebuchet-cc8befac3550c81d04ea206c170adae36c9a6c93.zip |
Move LauncherApplication's state and code to LauncherAppState.
This removes Launcher's static data and other state out of
the Application object. Now LauncherApplication (extends
Application) exists only to instantiate LauncherAppState.
Change-Id: I4e323bd78b77536b92054105536a55c0c2c19ba8
Diffstat (limited to 'src/com/android/launcher3/Folder.java')
-rw-r--r-- | src/com/android/launcher3/Folder.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 07c94007f..7b15e9edf 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -135,7 +135,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList super(context, attrs); setAlwaysDrawnWithCacheEnabled(false); mInflater = LayoutInflater.from(context); - mIconCache = ((LauncherApplication)context.getApplicationContext()).getIconCache(); + mIconCache = (LauncherAppState.getInstance()).getIconCache(); Resources res = getResources(); mMaxCountX = mMaxVisibleX = res.getInteger(R.integer.folder_max_count_x); |