diff options
author | Winson Chung <winsonc@google.com> | 2013-10-25 15:24:24 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2013-10-28 18:30:25 -0700 |
commit | 6e1c0d34bb31cacc24c57c89ab01deaa8985814f (patch) | |
tree | 71e51b408e5466f1a6ddde1bb5b8d46d420a77b2 /src/com/android/launcher3/Launcher.java | |
parent | 1c6dee72042cb20cd8ce12064305acdade7ebb8a (diff) | |
download | android_packages_apps_Trebuchet-6e1c0d34bb31cacc24c57c89ab01deaa8985814f.tar.gz android_packages_apps_Trebuchet-6e1c0d34bb31cacc24c57c89ab01deaa8985814f.tar.bz2 android_packages_apps_Trebuchet-6e1c0d34bb31cacc24c57c89ab01deaa8985814f.zip |
Initial changes to support smaller landscape layouts.
Change-Id: If0abe2b82eb08bae4f1ce65b805362d548acb876
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index f35daaade..29e8fe969 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -305,6 +305,7 @@ public class Launcher extends Activity private Drawable mWorkspaceBackgroundDrawable; private final ArrayList<Integer> mSynchronouslyBoundPages = new ArrayList<Integer>(); + private static final boolean DISABLE_SYNCHRONOUS_BINDING_CURRENT_PAGE = false; static final ArrayList<String> sDumpLogs = new ArrayList<String>(); static Date sDateStamp = new Date(); @@ -390,6 +391,7 @@ public class Launcher extends Activity display.getRealSize(realSize); DisplayMetrics dm = new DisplayMetrics(); display.getMetrics(dm); + // Lazy-initialize the dynamic grid DeviceProfile grid = app.initDynamicGrid(this, Math.min(smallestSize.x, smallestSize.y), @@ -437,18 +439,12 @@ public class Launcher extends Activity mSavedState = savedInstanceState; restoreState(mSavedState); - // Update customization drawer _after_ restoring the states - if (mAppsCustomizeContent != null) { - mAppsCustomizeContent.onPackagesUpdated( - LauncherModel.getSortedWidgetsAndShortcuts(this)); - } - if (PROFILE_STARTUP) { android.os.Debug.stopMethodTracing(); } if (!mRestoring) { - if (sPausedFromUserAction) { + if (DISABLE_SYNCHRONOUS_BINDING_CURRENT_PAGE || sPausedFromUserAction) { // If the user leaves launcher, then we should just load items asynchronously when // they return. mModel.startLoader(true, -1); @@ -3963,6 +3959,8 @@ public class Launcher extends Activity } else { if (mAppsCustomizeContent != null) { mAppsCustomizeContent.setApps(apps); + mAppsCustomizeContent.onPackagesUpdated( + LauncherModel.getSortedWidgetsAndShortcuts(this)); } } } |