summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDan Sandler <dsandler@android.com>2013-12-03 04:12:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-12-03 04:12:23 +0000
commitb3084e87fcf7b617899b3c858d5372d079e0fe36 (patch)
tree1a0d43c0870b9c28edacc8c76291907c3276c294 /src
parentc924cacfab4144eefdf8e46dfc82d79cb15e9c96 (diff)
parentd0e4118f2e87f890fb243c47d87dc47fcdd068ee (diff)
downloadandroid_packages_apps_Trebuchet-b3084e87fcf7b617899b3c858d5372d079e0fe36.tar.gz
android_packages_apps_Trebuchet-b3084e87fcf7b617899b3c858d5372d079e0fe36.tar.bz2
android_packages_apps_Trebuchet-b3084e87fcf7b617899b3c858d5372d079e0fe36.zip
Merge "Revert "Revert "Enable Launcher2 workspace import.""" into jb-ub-now-jolly-elf
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/LauncherProvider.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 54de63531..27b7dae2a 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -72,7 +72,7 @@ public class LauncherProvider extends ContentProvider {
static final String AUTHORITY = ProviderConfig.AUTHORITY;
// Should we attempt to load anything from the com.android.launcher2 provider?
- static final boolean IMPORT_LAUNCHER2_DATABASE = false;
+ static final boolean IMPORT_LAUNCHER2_DATABASE = true;
static final String TABLE_FAVORITES = "favorites";
static final String TABLE_WORKSPACE_SCREENS = "workspaceScreens";