Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove UPDOWN_GESTURES_ENABLED settings."

Browse Source
This commit is contained in:
TreeHugger Robot
2021-12-06 20:25:25 +00:00
committed by Android (Google) Code Review
parent edcc5a9682 185325a607
commit bdbb082af4
5 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/provider/Settings.java
View File

@@ -16669,12 +16669,6 @@ public final class Settings {
public static final String ALT_BYPASS_WIFI_REQUIREMENT_TIME_MILLIS =
"alt_bypass_wifi_requirement_time_millis";
/**
* Whether or not Up/Down Gestures are enabled.
* @hide
*/
public static final String UPDOWN_GESTURES_ENABLED = "updown_gestures_enabled";
/**
* Whether the setup was skipped.
* @hide

3
packages/SettingsProvider/res/values/defaults.xml
View File

@@ -272,9 +272,6 @@
<integer name="def_wearable_offChargerWifiUsageLimitMinutes">120</integer>
<!-- Default enabled state of accelerometer-based up/down gestures. -->
<bool name="def_wearable_upDownGesturesEnabled">false</bool>
<!-- Whether to enable mute when off body by default. -->
<bool name="def_wearable_muteWhenOffBodyEnabled">true</bool>

1
packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java
View File

@@ -205,7 +205,6 @@ public class GlobalSettingsValidators {
VALIDATORS.put(
Global.Wearable.ALT_BYPASS_WIFI_REQUIREMENT_TIME_MILLIS,
ANY_INTEGER_VALIDATOR);
VALIDATORS.put(Global.Wearable.UPDOWN_GESTURES_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(
Global.Wearable.SETUP_SKIPPED,
new DiscreteValueValidator(

5
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -5241,11 +5241,6 @@ public class SettingsProvider extends ContentProvider {
.def_wearable_offChargerWifiUsageLimitMinutes));
initGlobalSettingsDefaultValForWearLocked(
Global.Wearable.ALT_BYPASS_WIFI_REQUIREMENT_TIME_MILLIS, 0L);
initGlobalSettingsDefaultValForWearLocked(
Global.Wearable.UPDOWN_GESTURES_ENABLED,
getContext()
.getResources()
.getBoolean(R.bool.def_wearable_upDownGesturesEnabled));
initGlobalSettingsDefaultValForWearLocked(
Global.Wearable.SETUP_SKIPPED, Global.Wearable.SETUP_SKIPPED_UNKNOWN);
initGlobalSettingsDefaultValForWearLocked(

1
packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
View File

@@ -611,7 +611,6 @@ public class SettingsBackupTest {
Settings.Global.Wearable.AUTO_WIFI,
Settings.Global.Wearable.WIFI_POWER_SAVE,
Settings.Global.Wearable.ALT_BYPASS_WIFI_REQUIREMENT_TIME_MILLIS,
Settings.Global.Wearable.UPDOWN_GESTURES_ENABLED,
Settings.Global.Wearable.SETUP_SKIPPED,
Settings.Global.Wearable.LAST_CALL_FORWARD_ACTION,
Settings.Global.Wearable.STEM_1_TYPE,