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

lineage-sdk: Move force show navbar to lineage system settings

Browse Source 
*) Mild cleanup of DEV_FORCE_SHOW_NAVBAR in the process.

Change-Id: I519245ffb350c172bb1eef2b0d507089fc87907c
This commit is contained in:
Sam Mortimer
2018-09-27 22:17:17 -07:00
parent 055065c16f
commit 55db77b688
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/LineageSettingsProvider/res/values/defaults.xml
View File

@@ -62,7 +62,7 @@
$1=MODEL -->
<string name="def_device_name">%1$s</string>
<!-- Defaults for LineageSettings.Global.DEV_FORCE_SHOW_NAVBAR -->
<!-- Defaults for LineageSettings.System.FORCE_SHOW_NAVBAR -->
<integer name="def_force_show_navbar">0</integer>
<!-- Default for LineageSettings.Global.HEADS_UP_NOTIFICATIONS_ENABLED

6
packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderDefaultsTest.java
View File

@@ -79,6 +79,9 @@ public class LineageSettingsProviderDefaultsTest extends AndroidTestCase {
SYSTEM_SETTINGS_DEFAULTS.add(new Setting(
LineageSettings.System.STATUS_BAR_BATTERY_STYLE,
"R.integer.def_battery_style"));
SYSTEM_SETTINGS_DEFAULTS.add(new Setting(
LineageSettings.System.FORCE_SHOW_NAVBAR,
"R.integer.def_force_show_navbar"));
}
//SECURE
@@ -114,9 +117,6 @@ public class LineageSettingsProviderDefaultsTest extends AndroidTestCase {
GLOBAL_SETTINGS_DEFAULTS.add(new Setting(
LineageSettings.Global.WEATHER_TEMPERATURE_UNIT,
"R.integer.def_temperature_unit"));
GLOBAL_SETTINGS_DEFAULTS.add(new Setting(
LineageSettings.Global.DEV_FORCE_SHOW_NAVBAR,
"R.integer.def_force_show_navbar"));
}
@Override

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

@@ -463,7 +463,6 @@ public final class LineageSettings {
protected static final ArraySet<String> MOVED_TO_SECURE;
static {
MOVED_TO_SECURE = new ArraySet<>(1);
MOVED_TO_SECURE.add(Secure.DEV_FORCE_SHOW_NAVBAR);
}
// region Methods
@@ -2061,6 +2060,16 @@ public final class LineageSettings {
public static final Validator LONG_SCREEN_APPS_VALIDATOR =
sAlwaysTrueValidator;
/**
* Force show navigation bar setting.
* @hide
*/
public static final String FORCE_SHOW_NAVBAR = "force_show_navbar";
/** @hide */
public static final Validator FORCE_SHOW_NAVBAR_VALIDATOR =
sBooleanValidator;
/**
* I can haz more bukkits
* @hide
@@ -2183,9 +2192,6 @@ public final class LineageSettings {
public static boolean shouldInterceptSystemProvider(String key) {
switch (key) {
case System.SYSTEM_PROFILES_ENABLED:
// some apps still query Settings.System.DEV_FORCE_SHOW_NAVBAR;
// we intercept the call, and return LineageSettings.Secure.DEV_FORCE_SHOW_NAVBAR's value
case Secure.DEV_FORCE_SHOW_NAVBAR:
return true;
default:
return false;
@@ -2353,6 +2359,8 @@ public final class LineageSettings {
ACCELEROMETER_ROTATION_ANGLES_VALIDATOR);
VALIDATORS.put(LONG_SCREEN_APPS,
LONG_SCREEN_APPS_VALIDATOR);
VALIDATORS.put(FORCE_SHOW_NAVBAR,
FORCE_SHOW_NAVBAR_VALIDATOR);
VALIDATORS.put(__MAGICAL_TEST_PASSING_ENABLER,
__MAGICAL_TEST_PASSING_ENABLER_VALIDATOR);
};
@@ -2379,7 +2387,6 @@ public final class LineageSettings {
protected static final ArraySet<String> MOVED_TO_GLOBAL;
static {
MOVED_TO_GLOBAL = new ArraySet<>(1);
MOVED_TO_GLOBAL.add(Global.DEV_FORCE_SHOW_NAVBAR);
}
// region Methods
@@ -3230,11 +3237,6 @@ public final class LineageSettings {
*/
public static boolean shouldInterceptSystemProvider(String key) {
switch (key) {
// some apps still query Settings.System.DEV_FORCE_SHOW_NAVBAR, and it was moved to
// Settings.Secure, then LineageSettings.Secure. Forward queries from Settings.Secure
// to LineageSettings.Secure here just in case an app stuck with the Settings.Secure call
case DEV_FORCE_SHOW_NAVBAR:
return true;
default:
return false;
}
@@ -3669,6 +3671,7 @@ public final class LineageSettings {
/**
* Developer options - Navigation Bar show switch
* @deprecated
* @hide
*/
public static final String DEV_FORCE_SHOW_NAVBAR = "dev_force_show_navbar";