diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-01-29 14:30:08 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-01-29 14:30:08 -0800 |
commit | ad37152c14c716f678d07dd568811a9704c2a9c8 (patch) | |
tree | bf5e511281d04fd9b2ce87dc2bac4017b8d8d57b /src/com/android/launcher3/LauncherSettings.java | |
parent | a22921fc31930887fc9d6b3fb1ceb37c0ad098c5 (diff) | |
parent | b171e5675b91e6e4fc1cf741b3b2d0313ad2fe27 (diff) | |
download | android_packages_apps_Trebuchet-ad37152c14c716f678d07dd568811a9704c2a9c8.tar.gz android_packages_apps_Trebuchet-ad37152c14c716f678d07dd568811a9704c2a9c8.tar.bz2 android_packages_apps_Trebuchet-ad37152c14c716f678d07dd568811a9704c2a9c8.zip |
resolve merge conflicts of b171e5675b to ub-launcher3-calgary.
Change-Id: I329c7518d8c3f0f43e96c6446d5b53a6f4439211
Diffstat (limited to 'src/com/android/launcher3/LauncherSettings.java')
-rw-r--r-- | src/com/android/launcher3/LauncherSettings.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/launcher3/LauncherSettings.java b/src/com/android/launcher3/LauncherSettings.java index 55a53785f..fb5306830 100644 --- a/src/com/android/launcher3/LauncherSettings.java +++ b/src/com/android/launcher3/LauncherSettings.java @@ -341,6 +341,8 @@ public class LauncherSettings { public static final String EXTRA_VALUE = "value"; public static final String EXTRA_DEFAULT_VALUE = "default_value"; + // Extra for set_boolean method to also notify the backup manager of the change. + public static final String NOTIFY_BACKUP = "notify_backup"; public static Bundle call(ContentResolver cr, String method) { return cr.call(CONTENT_URI, method, null, null); |