From e9206cc3a371deb81a13140c5ab82c77907dde3d Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sat, 6 Nov 2021 12:55:52 +0200 Subject: [PATCH] LineageSettings: Remove "advanced_mode" setting * This was a CyanogenMod feature that we never forward ported. Change-Id: Idce22d57784132ff0676bce3e1dd55f9793c1a59 --- host/migration/src/LineageSettings.java | 8 -------- packages/LineageSettingsProvider/res/values/defaults.xml | 3 --- .../lineageos/lineagesettings/LineageDatabaseHelper.java | 3 --- .../tests/LineageSettingsProviderDefaultsTest.java | 3 --- sdk/src/java/lineageos/providers/LineageSettings.java | 8 -------- 5 files changed, 25 deletions(-) diff --git a/host/migration/src/LineageSettings.java b/host/migration/src/LineageSettings.java index 374b4863..2942e2f1 100644 --- a/host/migration/src/LineageSettings.java +++ b/host/migration/src/LineageSettings.java @@ -657,13 +657,6 @@ public final class LineageSettings { // region Secure Settings - /** - * Whether to enable "advanced mode" for the current user. - * Boolean setting. 0 = no, 1 = yes. - * @hide - */ - public static final String ADVANCED_MODE = "advanced_mode"; - /** * The time in ms to keep the button backlight on after pressing a button. * A value of 0 will keep the buttons on for as long as the screen is on. @@ -847,7 +840,6 @@ public final class LineageSettings { * @hide */ public static final String[] LEGACY_SECURE_SETTINGS = new String[]{ - LineageSettings.Secure.ADVANCED_MODE, LineageSettings.Secure.BUTTON_BACKLIGHT_TIMEOUT, LineageSettings.Secure.BUTTON_BRIGHTNESS, LineageSettings.Secure.DEV_FORCE_SHOW_NAVBAR, diff --git a/packages/LineageSettingsProvider/res/values/defaults.xml b/packages/LineageSettingsProvider/res/values/defaults.xml index 570b0835..681c4c46 100644 --- a/packages/LineageSettingsProvider/res/values/defaults.xml +++ b/packages/LineageSettingsProvider/res/values/defaults.xml @@ -29,9 +29,6 @@ - - true - false diff --git a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java index 960b2f3e..b5125a6a 100644 --- a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java +++ b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java @@ -473,9 +473,6 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{ stmt = db.compileStatement("INSERT OR IGNORE INTO secure(name,value)" + " VALUES(?,?);"); // Secure - loadBooleanSetting(stmt, LineageSettings.Secure.ADVANCED_MODE, - R.bool.def_advanced_mode); - loadBooleanSetting(stmt, LineageSettings.Secure.STATS_COLLECTION, R.bool.def_stats_collection); diff --git a/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderDefaultsTest.java b/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderDefaultsTest.java index 44cce1dd..1864ce4f 100644 --- a/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderDefaultsTest.java +++ b/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderDefaultsTest.java @@ -76,9 +76,6 @@ public class LineageSettingsProviderDefaultsTest extends AndroidTestCase { //SECURE static { - SECURE_SETTINGS_DEFAULTS.add(new Setting( - LineageSettings.Secure.ADVANCED_MODE, - "R.bool.def_advanced_mode")); SECURE_SETTINGS_DEFAULTS.add(new Setting( LineageSettings.Secure.STATS_COLLECTION, "R.bool.def_stats_collection")); diff --git a/sdk/src/java/lineageos/providers/LineageSettings.java b/sdk/src/java/lineageos/providers/LineageSettings.java index e2145433..577177d3 100644 --- a/sdk/src/java/lineageos/providers/LineageSettings.java +++ b/sdk/src/java/lineageos/providers/LineageSettings.java @@ -2690,13 +2690,6 @@ public final class LineageSettings { // region Secure Settings - /** - * Whether to enable "advanced mode" for the current user. - * Boolean setting. 0 = no, 1 = yes. - * @hide - */ - public static final String ADVANCED_MODE = "advanced_mode"; - /** * The time in ms to keep the button backlight on after pressing a button. * A value of 0 will keep the buttons on for as long as the screen is on. @@ -3007,7 +3000,6 @@ public final class LineageSettings { * @hide */ public static final String[] LEGACY_SECURE_SETTINGS = new String[]{ - LineageSettings.Secure.ADVANCED_MODE, LineageSettings.Secure.BUTTON_BACKLIGHT_TIMEOUT, LineageSettings.Secure.BUTTON_BRIGHTNESS, LineageSettings.Secure.KEYBOARD_BRIGHTNESS,