From ea5bec56fd90dc9ce413051e1f3d4c411ae98800 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Sat, 5 Jun 2021 15:09:10 +0100 Subject: [PATCH] LineageSettings: Deprecate charging sound settings in favor of AOSP ones There's no need to have our own settings for this when we can simply override the existing AOSP ones. Change-Id: I84e1f7286cd6b4ee68c62f17ad104c76031ee0ff --- host/migration/src/LineageSettings.java | 14 ---------- .../res/values/defaults.xml | 8 ------ .../LineageDatabaseHelper.java | 27 +++---------------- .../LineageSettingsProviderDefaultsTest.java | 9 +++---- .../lineageos/providers/LineageSettings.java | 14 ---------- 5 files changed, 8 insertions(+), 64 deletions(-) diff --git a/host/migration/src/LineageSettings.java b/host/migration/src/LineageSettings.java index 2942e2f1..20d0fb35 100644 --- a/host/migration/src/LineageSettings.java +++ b/host/migration/src/LineageSettings.java @@ -889,18 +889,6 @@ public final class LineageSettings { public static final String BLUETOOTH_A2DP_SRC_PRIORITY_PREFIX = "bluetooth_a2dp_src_priority_"; - /** - * Whether to vibrate when charger power is connected/disconnected - * @hide - */ - public static final String POWER_NOTIFICATIONS_VIBRATE = "power_notifications_vibrate"; - - /** - * URI for power notification sounds - * @hide - */ - public static final String POWER_NOTIFICATIONS_RINGTONE = "power_notifications_ringtone"; - /** * @hide */ @@ -921,8 +909,6 @@ public final class LineageSettings { */ public static final String[] LEGACY_GLOBAL_SETTINGS = new String[]{ LineageSettings.Global.WAKE_WHEN_PLUGGED_OR_UNPLUGGED, - LineageSettings.Global.POWER_NOTIFICATIONS_VIBRATE, - LineageSettings.Global.POWER_NOTIFICATIONS_RINGTONE, LineageSettings.Global.ZEN_DISABLE_DUCKING_DURING_MEDIA_PLAYBACK, LineageSettings.Global.WIFI_AUTO_PRIORITIES_CONFIGURATION}; diff --git a/packages/LineageSettingsProvider/res/values/defaults.xml b/packages/LineageSettingsProvider/res/values/defaults.xml index 07261851..9b52ce1a 100644 --- a/packages/LineageSettingsProvider/res/values/defaults.xml +++ b/packages/LineageSettingsProvider/res/values/defaults.xml @@ -78,12 +78,4 @@ --> 2 - - - - false - - - /system/product/media/audio/ui/WirelessChargingStarted.ogg - diff --git a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java index b5125a6a..c354758b 100644 --- a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java +++ b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java @@ -358,22 +358,9 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{ } if (upgradeVersion < 13) { - // Update custom charging sound setting - if (mUserHandle == UserHandle.USER_OWNER) { - db.beginTransaction(); - SQLiteStatement stmt = null; - try { - stmt = db.compileStatement("UPDATE global SET value=? WHERE name=?"); - stmt.bindString(1, mContext.getResources() - .getString(R.string.def_power_notifications_ringtone)); - stmt.bindString(2, LineageSettings.Global.POWER_NOTIFICATIONS_RINGTONE); - stmt.execute(); - db.setTransactionSuccessful(); - } finally { - if (stmt != null) stmt.close(); - db.endTransaction(); - } - } + /* Was used to migrate LineageSettings.Global.POWER_NOTIFICATIONS_RINGTONE, + * but this setting has been deprecated + */ upgradeVersion = 13; } @@ -540,13 +527,7 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{ stmt = db.compileStatement("INSERT OR IGNORE INTO global(name,value)" + " VALUES(?,?);"); // Global - loadBooleanSetting(stmt, - LineageSettings.Global.POWER_NOTIFICATIONS_VIBRATE, - R.bool.def_power_notifications_vibrate); - - loadStringSetting(stmt, - LineageSettings.Global.POWER_NOTIFICATIONS_RINGTONE, - R.string.def_power_notifications_ringtone); + // this is a placeholder } finally { if (stmt != null) stmt.close(); } 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 1864ce4f..247d324c 100644 --- a/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderDefaultsTest.java +++ b/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderDefaultsTest.java @@ -85,14 +85,13 @@ public class LineageSettingsProviderDefaultsTest extends AndroidTestCase { } //GLOBAL + /* static { GLOBAL_SETTINGS_DEFAULTS.add(new Setting( - LineageSettings.Global.POWER_NOTIFICATIONS_VIBRATE, - "R.bool.def_power_notifications_vibrate")); - GLOBAL_SETTINGS_DEFAULTS.add(new Setting( - LineageSettings.Global.POWER_NOTIFICATIONS_RINGTONE, - "R.string.def_power_notifications_ringtone")); + LineageSettings.Global.WAKE_WHEN_PLUGGED_OR_UNPLUGGED, + false)); } + */ @Override protected void setUp() throws Exception { diff --git a/sdk/src/java/lineageos/providers/LineageSettings.java b/sdk/src/java/lineageos/providers/LineageSettings.java index 62bf7387..228410f8 100644 --- a/sdk/src/java/lineageos/providers/LineageSettings.java +++ b/sdk/src/java/lineageos/providers/LineageSettings.java @@ -3441,18 +3441,6 @@ public final class LineageSettings { public static final String WAKE_WHEN_PLUGGED_OR_UNPLUGGED = "wake_when_plugged_or_unplugged"; - /** - * Whether to vibrate when charger power is connected/disconnected - * @hide - */ - public static final String POWER_NOTIFICATIONS_VIBRATE = "power_notifications_vibrate"; - - /** - * URI for power notification sounds - * @hide - */ - public static final String POWER_NOTIFICATIONS_RINGTONE = "power_notifications_ringtone"; - /** * @hide */ @@ -3488,8 +3476,6 @@ public final class LineageSettings { */ public static final String[] LEGACY_GLOBAL_SETTINGS = new String[]{ LineageSettings.Global.WAKE_WHEN_PLUGGED_OR_UNPLUGGED, - LineageSettings.Global.POWER_NOTIFICATIONS_VIBRATE, - LineageSettings.Global.POWER_NOTIFICATIONS_RINGTONE, LineageSettings.Global.ZEN_DISABLE_DUCKING_DURING_MEDIA_PLAYBACK, LineageSettings.Global.WIFI_AUTO_PRIORITIES_CONFIGURATION };