summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/LauncherModel.java
diff options
context:
space:
mode:
authorDan Sandler <dsandler@android.com>2013-11-19 12:21:25 -0500
committerDan Sandler <dsandler@android.com>2013-11-19 19:31:04 +0000
commitf0b8dacf1516e0d901c71109c906dc15ef855fc5 (patch)
tree623e23570c2af9270a743ab83819d49e9e06a0bb /src/com/android/launcher3/LauncherModel.java
parent540efef758eb3bcf3bafe2241a4e3652a0e22c56 (diff)
downloadandroid_packages_apps_Trebuchet-f0b8dacf1516e0d901c71109c906dc15ef855fc5.tar.gz
android_packages_apps_Trebuchet-f0b8dacf1516e0d901c71109c906dc15ef855fc5.tar.bz2
android_packages_apps_Trebuchet-f0b8dacf1516e0d901c71109c906dc15ef855fc5.zip
Disable importing workspaces from Launcher2.
Bug: 9832552 Bug: 11761032 Change-Id: I4dfd16046e9d6d0d1d864dff4340b0ed13cc8b8f
Diffstat (limited to 'src/com/android/launcher3/LauncherModel.java')
-rw-r--r--src/com/android/launcher3/LauncherModel.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index c3d466644..6a6cb3538 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -1636,7 +1636,9 @@ public class LauncherModel extends BroadcastReceiver {
LauncherAppState.getLauncherProvider().loadDefaultFavoritesIfNecessary(0);
// Check if we need to do any upgrade-path logic
+ // (Includes having just imported default favorites)
boolean loadedOldDb = LauncherAppState.getLauncherProvider().justLoadedOldDb();
+
// Log to disk
Launcher.addDumpLog(TAG, "11683562 - loadedOldDb: " + loadedOldDb, true);