Merge "Consolidate wake-screen settings" (bdd22d05) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -7466,14 +7466,6 @@ public final class Settings {

		private static final Validator DOZE_TAP_SCREEN_GESTURE_VALIDATOR = BOOLEAN_VALIDATOR;

		/**
		* Gesture that wakes up the lock screen.
		* @hide
		*/
		public static final String DOZE_WAKE_LOCK_SCREEN_GESTURE = "doze_wake_lock_screen_gesture";

		private static final Validator DOZE_WAKE_LOCK_SCREEN_GESTURE_VALIDATOR = BOOLEAN_VALIDATOR;

		/**
		* Gesture that wakes up the display, showing the ambient version of the status bar.
		* @hide
		@@ -8589,7 +8581,6 @@ public final class Settings {
		DOZE_PICK_UP_GESTURE,
		DOZE_DOUBLE_TAP_GESTURE,
		DOZE_TAP_SCREEN_GESTURE,
		DOZE_WAKE_LOCK_SCREEN_GESTURE,
		DOZE_WAKE_SCREEN_GESTURE,
		NFC_PAYMENT_DEFAULT_COMPONENT,
		AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,
		@@ -8749,7 +8740,6 @@ public final class Settings {
		VALIDATORS.put(DOZE_PICK_UP_GESTURE, DOZE_PICK_UP_GESTURE_VALIDATOR);
		VALIDATORS.put(DOZE_DOUBLE_TAP_GESTURE, DOZE_DOUBLE_TAP_GESTURE_VALIDATOR);
		VALIDATORS.put(DOZE_TAP_SCREEN_GESTURE, DOZE_TAP_SCREEN_GESTURE_VALIDATOR);
		VALIDATORS.put(DOZE_WAKE_LOCK_SCREEN_GESTURE, DOZE_WAKE_LOCK_SCREEN_GESTURE_VALIDATOR);
		VALIDATORS.put(DOZE_WAKE_SCREEN_GESTURE, DOZE_WAKE_SCREEN_GESTURE_VALIDATOR);
		VALIDATORS.put(NFC_PAYMENT_DEFAULT_COMPONENT, NFC_PAYMENT_DEFAULT_COMPONENT_VALIDATOR);
		VALIDATORS.put(AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,

+1 −6

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ public class AmbientDisplayConfiguration {
		return pulseOnNotificationEnabled(user)
		\|\| pulseOnLongPressEnabled(user)
		\|\| alwaysOnEnabled(user)
		\|\| wakeLockScreenGestureEnabled(user);
		\|\| wakeScreenGestureEnabled(user);
		}

		public boolean pulseOnNotificationEnabled(int user) {
		@@ -76,11 +76,6 @@ public class AmbientDisplayConfiguration {
		return !TextUtils.isEmpty(doubleTapSensorType());
		}

		public boolean wakeLockScreenGestureEnabled(int user) {
		return boolSettingDefaultOn(Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE, user)
		&& wakeScreenGestureAvailable();
		}

		public boolean wakeScreenGestureAvailable() {
		return mContext.getResources()
		.getBoolean(R.bool.config_dozeWakeLockScreenSensorAvailable);

+1 −1

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ public class DozeSensors {
		false /* touchscreen */),
		new PluginSensor(
		new SensorManagerPlugin.Sensor(TYPE_WAKE_LOCK_SCREEN),
		Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE,
		Settings.Secure.DOZE_WAKE_SCREEN_GESTURE,
		mConfig.wakeScreenGestureAvailable(),
		DozeLog.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN,
		false /* reports touch coordinates */,