Android/lineage-sdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate berry_black_theme to Secure table

Browse Source 
AOSP theme settings live in Secure table, let's do the same

Change-Id: I31eafeb940fe50cdde03e12cb3431f4f325d772b
This commit is contained in:
Michael Bestas
2022-09-25 17:28:37 +03:00
committed by Bruno Martins
parent 500f74f78f
commit 938f8dfd57
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java
View File

@@ -60,7 +60,7 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{
private static final boolean LOCAL_LOGV = false;
private static final String DATABASE_NAME = "lineagesettings.db";
private static final int DATABASE_VERSION = 16;
private static final int DATABASE_VERSION = 17;
private static final String DATABASE_NAME_OLD = "cmsettings.db";
@@ -419,6 +419,15 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{
}
upgradeVersion = 16;
}
if (upgradeVersion < 17) {
// Move berry_black_theme to secure
moveSettingsToNewTable(db, LineageTableNames.TABLE_SYSTEM,
LineageTableNames.TABLE_SECURE, new String[] {
LineageSettings.Secure.BERRY_BLACK_THEME
}, true);
upgradeVersion = 17;
}
// *** Remember to update DATABASE_VERSION above!
if (upgradeVersion != newVersion) {
Log.wtf(TAG, "warning: upgrading settings database to version "

19
sdk/src/java/lineageos/providers/LineageSettings.java
View File

@@ -1426,15 +1426,6 @@ public final class LineageSettings {
public static final Validator PROXIMITY_ON_WAKE_VALIDATOR =
sBooleanValidator;
/**
* Whether to use black theme for dark mode
*/
public static final String BERRY_BLACK_THEME = "berry_black_theme";
/** @hide */
public static final Validator BERRY_BLACK_THEME_VALIDATOR =
sBooleanValidator;
/**
* Color temperature of the display during the day
*/
@@ -2236,7 +2227,6 @@ public final class LineageSettings {
VALIDATORS.put(BATTERY_LIGHT_FULL_COLOR, BATTERY_LIGHT_FULL_COLOR_VALIDATOR);
VALIDATORS.put(ENABLE_MWI_NOTIFICATION, ENABLE_MWI_NOTIFICATION_VALIDATOR);
VALIDATORS.put(PROXIMITY_ON_WAKE, PROXIMITY_ON_WAKE_VALIDATOR);
VALIDATORS.put(BERRY_BLACK_THEME, BERRY_BLACK_THEME_VALIDATOR);
VALIDATORS.put(DISPLAY_TEMPERATURE_DAY, DISPLAY_TEMPERATURE_DAY_VALIDATOR);
VALIDATORS.put(DISPLAY_TEMPERATURE_NIGHT, DISPLAY_TEMPERATURE_NIGHT_VALIDATOR);
VALIDATORS.put(DISPLAY_TEMPERATURE_MODE, DISPLAY_TEMPERATURE_MODE_VALIDATOR);
@@ -2996,6 +2986,14 @@ public final class LineageSettings {
public static final Validator TETHERING_ALLOW_VPN_UPSTREAMS_VALIDATOR = sBooleanValidator;
/**
* Whether to use black theme for dark mode
* @hide
*/
public static final String BERRY_BLACK_THEME = "berry_black_theme";
/** @hide */
public static final Validator BERRY_BLACK_THEME_VALIDATOR = sBooleanValidator;
// endregion
/**
@@ -3048,6 +3046,7 @@ public final class LineageSettings {
public static final Map<String, Validator> VALIDATORS =
new ArrayMap<String, Validator>();
static {
VALIDATORS.put(BERRY_BLACK_THEME, BERRY_BLACK_THEME_VALIDATOR);
VALIDATORS.put(GESTURE_BACK_EXCLUDE_TOP, GESTURE_BACK_EXCLUDE_TOP_VALIDATOR);
VALIDATORS.put(NETWORK_TRAFFIC_MODE, NETWORK_TRAFFIC_MODE_VALIDATOR);
VALIDATORS.put(NETWORK_TRAFFIC_AUTOHIDE, NETWORK_TRAFFIC_AUTOHIDE_VALIDATOR);