From f3583e75dcfbae81d597dbabfd9f43dd5d73b29b Mon Sep 17 00:00:00 2001 From: Adnan Begovic Date: Fri, 6 Nov 2015 11:30:22 -0800 Subject: CMSettings: Add migrate step for NAV_BUTTONS. Change-Id: Ia17ccba0e0b66ee35f3ac7f125f909dc010514d6 --- .../src/org/cyanogenmod/cmsettings/CMSettingsProvider.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'packages') 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 systemToCmSettingsMap = new HashMap(); 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 ? -- cgit v1.1