aboutsummaryrefslogtreecommitdiffstats
path: root/packages/CMSettingsProvider/src
diff options
context:
space:
mode:
authorAdnan Begovic <adnan@cyngn.com>2015-11-06 11:30:22 -0800
committerAdnan Begovic <adnan@cyngn.com>2015-11-06 11:30:45 -0800
commitf3583e75dcfbae81d597dbabfd9f43dd5d73b29b (patch)
treed39a5bfced88b7afb3861abcdc2ede81bddf9295 /packages/CMSettingsProvider/src
parent6a79d5714ce26bf0235c5fb4b25d4f55f9a9460e (diff)
downloadvendor_cmsdk-f3583e75dcfbae81d597dbabfd9f43dd5d73b29b.zip
vendor_cmsdk-f3583e75dcfbae81d597dbabfd9f43dd5d73b29b.tar.gz
vendor_cmsdk-f3583e75dcfbae81d597dbabfd9f43dd5d73b29b.tar.bz2
CMSettings: Add migrate step for NAV_BUTTONS.
Change-Id: Ia17ccba0e0b66ee35f3ac7f125f909dc010514d6
Diffstat (limited to 'packages/CMSettingsProvider/src')
-rw-r--r--packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java
index a55ae2c..2d88e41 100644
--- a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java
+++ b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java
@@ -284,6 +284,12 @@ public class CMSettingsProvider extends ContentProvider {
* @hide
*/
public static final String RECENTS_LONG_PRESS_ACTIVITY = "recents_long_press_activity";
+
+ /**
+ * Navigation controls to Use
+ * @hide
+ */
+ public static final String NAV_BUTTONS = "nav_buttons";
}
/**
@@ -298,6 +304,8 @@ public class CMSettingsProvider extends ContentProvider {
HashMap<String, String> systemToCmSettingsMap = new HashMap<String, String>();
systemToCmSettingsMap.put(LegacyCMSettings.STATUS_BAR_QUICK_QS_PULLDOWN,
CMSettings.System.QS_QUICK_PULLDOWN);
+ systemToCmSettingsMap.put(LegacyCMSettings.NAV_BUTTONS,
+ CMSettings.System.NAV_BUTTONS);
int rowsMigrated = migrateCMSettingsForTable(userId,
CMDatabaseHelper.CMTableNames.TABLE_SYSTEM, systemToCmSettingsMap);
@@ -334,7 +342,6 @@ public class CMSettingsProvider extends ContentProvider {
CMSettings.Secure.QS_USE_MAIN_TILES);
secureToCmSettingsMap.put(LegacyCMSettings.VOLUME_LINK_NOTIFICATION,
CMSettings.Secure.VOLUME_LINK_NOTIFICATION);
-
int navRingTargetsLength = LegacyCMSettings.NAVIGATION_RING_TARGETS.length;
int cmNavRingTargetsLength = CMSettings.Secure.NAVIGATION_RING_TARGETS.length;
int minNavRingTargetsLength = navRingTargetsLength <= cmNavRingTargetsLength ?