diff options
| author | Dan Sandler <dsandler@android.com> | 2013-12-03 16:44:52 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-03 16:44:52 -0800 |
| commit | b4ee57927224429e34e3a81519b2ea658e41fc45 (patch) | |
| tree | aa8511319a08677679b7967e7bb925f460f085e3 /src | |
| parent | 87f445c8b28c59e787e5fbfc7ba223e112d2263f (diff) | |
| parent | b3084e87fcf7b617899b3c858d5372d079e0fe36 (diff) | |
| download | android_packages_apps_Trebuchet-b4ee57927224429e34e3a81519b2ea658e41fc45.tar.gz android_packages_apps_Trebuchet-b4ee57927224429e34e3a81519b2ea658e41fc45.tar.bz2 android_packages_apps_Trebuchet-b4ee57927224429e34e3a81519b2ea658e41fc45.zip | |
am b3084e87: Merge "Revert "Revert "Enable Launcher2 workspace import.""" into jb-ub-now-jolly-elf
* commit 'b3084e87fcf7b617899b3c858d5372d079e0fe36':
Revert "Revert "Enable Launcher2 workspace import.""
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 2 |
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"; |