diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2014-11-10 18:05:31 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2014-11-12 12:23:35 -0800 |
commit | e0f58d73646871497596fb8f7321d407e7565c28 (patch) | |
tree | 862ab1b6c9cc32711d928fba29be052d8a556e78 /src/com/android/launcher3/LauncherAppState.java | |
parent | b155bbb375c6bfed14f79def122d69c7659434f7 (diff) | |
download | android_packages_apps_Trebuchet-e0f58d73646871497596fb8f7321d407e7565c28.tar.gz android_packages_apps_Trebuchet-e0f58d73646871497596fb8f7321d407e7565c28.tar.bz2 android_packages_apps_Trebuchet-e0f58d73646871497596fb8f7321d407e7565c28.zip |
Adding shortcuts corresponding to ManagedUsers automatically.
Bug: 16188104
Change-Id: Ic07578dd187263f59f3c431cbb78dea90d0c24f4
Diffstat (limited to 'src/com/android/launcher3/LauncherAppState.java')
-rw-r--r-- | src/com/android/launcher3/LauncherAppState.java | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java index e5fa03208..ec914d873 100644 --- a/src/com/android/launcher3/LauncherAppState.java +++ b/src/com/android/launcher3/LauncherAppState.java @@ -46,12 +46,14 @@ public class LauncherAppState implements DeviceProfile.DeviceProfileCallbacks { private final AppFilter mAppFilter; private final BuildInfo mBuildInfo; - private LauncherModel mModel; - private IconCache mIconCache; + private final LauncherModel mModel; + private final IconCache mIconCache; + + private final boolean mIsScreenLarge; + private final float mScreenDensity; + private final int mLongPressTimeout = 300; + private WidgetPreviewLoader.CacheDb mWidgetPreviewCacheDb; - private boolean mIsScreenLarge; - private float mScreenDensity; - private int mLongPressTimeout = 300; private boolean mWallpaperChangedSinceLastCheck; private static WeakReference<LauncherProvider> sLauncherProvider; @@ -159,9 +161,6 @@ public class LauncherAppState implements DeviceProfile.DeviceProfileCallbacks { }; LauncherModel setLauncher(Launcher launcher) { - if (mModel == null) { - throw new IllegalStateException("setLauncher() called before init()"); - } mModel.initialize(launcher); return mModel; } |