diff options
| author | Sam Mortimer <sam@mortimer.me.uk> | 2018-09-27 22:17:17 -0700 |
|---|---|---|
| committer | doc HD <doc.divxm@gmail.com> | 2018-09-28 19:44:24 +0300 |
| commit | 6bed83770d815b14542d7e067a4227b62c9ffd57 (patch) | |
| tree | 3a67fcd8cc90a052d8fd25269abe49fd0d4f17d8 /sdk/src/java | |
| parent | 02245392e83807c47a42cdee3281fb73a7f22507 (diff) | |
*) Mild cleanup of DEV_FORCE_SHOW_NAVBAR in the process.
Change-Id: I519245ffb350c172bb1eef2b0d507089fc87907c
Diffstat (limited to 'sdk/src/java')
| -rw-r--r-- | sdk/src/java/lineageos/providers/LineageSettings.java | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/sdk/src/java/lineageos/providers/LineageSettings.java b/sdk/src/java/lineageos/providers/LineageSettings.java index ec1eeaa2..06b68737 100644 --- a/sdk/src/java/lineageos/providers/LineageSettings.java +++ b/sdk/src/java/lineageos/providers/LineageSettings.java @@ -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 @@ -2062,6 +2061,16 @@ public final class LineageSettings { 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"; |