diff options
author | Chris Wren <cwren@android.com> | 2014-01-14 14:58:43 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-14 14:58:43 +0000 |
commit | dc9c125236c9eab434b7c909d18f748c645c8118 (patch) | |
tree | f0e16d8803b338803ece84c99750589f52d82862 /src/com/android/launcher3/LauncherBackupAgentHelper.java | |
parent | 4808aa6b42ff31aa792b6dc0601bd6f24a554e21 (diff) | |
parent | 4b171361ca4ef2d88cd9493c6d92bb390df45289 (diff) | |
download | android_packages_apps_Trebuchet-dc9c125236c9eab434b7c909d18f748c645c8118.tar.gz android_packages_apps_Trebuchet-dc9c125236c9eab434b7c909d18f748c645c8118.tar.bz2 android_packages_apps_Trebuchet-dc9c125236c9eab434b7c909d18f748c645c8118.zip |
Merge "hide launcher restore behind a flag." into jb-ub-now-kermit
Diffstat (limited to 'src/com/android/launcher3/LauncherBackupAgentHelper.java')
-rw-r--r-- | src/com/android/launcher3/LauncherBackupAgentHelper.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/com/android/launcher3/LauncherBackupAgentHelper.java b/src/com/android/launcher3/LauncherBackupAgentHelper.java index 83e4a60d4..876cf0887 100644 --- a/src/com/android/launcher3/LauncherBackupAgentHelper.java +++ b/src/com/android/launcher3/LauncherBackupAgentHelper.java @@ -21,6 +21,7 @@ import android.app.backup.BackupManager; import android.app.backup.SharedPreferencesBackupHelper; import android.content.Context; import android.content.SharedPreferences; +import android.provider.Settings; public class LauncherBackupAgentHelper extends BackupAgentHelper { @@ -28,6 +29,8 @@ public class LauncherBackupAgentHelper extends BackupAgentHelper { private static BackupManager sBackupManager; + protected static final String SETTING_RESTORE_ENABLED = "launcher_restore_enabled"; + /** * Notify the backup manager that out database is dirty. * @@ -54,9 +57,15 @@ public class LauncherBackupAgentHelper extends BackupAgentHelper { @Override public void onCreate() { + + boolean restoreEnabled = 0 != Settings.Secure.getInt( + getContentResolver(), SETTING_RESTORE_ENABLED, 0); + addHelper(LauncherBackupHelper.LAUNCHER_PREFS_PREFIX, - new SharedPreferencesBackupHelper(this, - LauncherAppState.getSharedPreferencesKey())); - addHelper(LauncherBackupHelper.LAUNCHER_PREFIX, new LauncherBackupHelper(this)); + new LauncherPreferencesBackupHelper(this, + LauncherAppState.getSharedPreferencesKey(), + restoreEnabled)); + addHelper(LauncherBackupHelper.LAUNCHER_PREFIX, + new LauncherBackupHelper(this, restoreEnabled)); } } |