Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdbb082a authored Dec 06, 2021 by TreeHugger Robot Committed by Android (Google) Code Review Dec 06, 2021

Merge "Remove UPDOWN_GESTURES_ENABLED settings."

parents edcc5a96 185325a6

core/java/android/provider/Settings.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -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

packages/SettingsProvider/res/values/defaults.xml

+0 −3

Original line number	Diff line number	Diff line
		@@ -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>

packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -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(

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -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(

packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -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,