Merge "Allow wake_lock_screen when AOD is off" into qt-r1-dev am: 98a51d1080 (62f3c5c0) · Commits · e / os / android_frameworks_base

core/java/android/hardware/display/AmbientDisplayConfiguration.java

+10 −3

Original line number	Diff line number	Diff line
		@@ -48,7 +48,8 @@ public class AmbientDisplayConfiguration {
		return pulseOnNotificationEnabled(user)
		\|\| pulseOnLongPressEnabled(user)
		\|\| alwaysOnEnabled(user)
		\|\| wakeScreenGestureEnabled(user)
		\|\| wakeLockScreenGestureEnabled(user)
		\|\| wakeDisplayGestureEnabled(user)
		\|\| pickupGestureEnabled(user)
		\|\| tapGestureEnabled(user)
		\|\| doubleTapGestureEnabled(user);
		@@ -105,8 +106,14 @@ public class AmbientDisplayConfiguration {
		}

		/** {@hide} */
		public boolean wakeScreenGestureEnabled(int user) {
		return boolSettingDefaultOn(Settings.Secure.DOZE_WAKE_SCREEN_GESTURE, user)
		public boolean wakeLockScreenGestureEnabled(int user) {
		return boolSettingDefaultOn(Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE, user)
		&& wakeScreenGestureAvailable();
		}

		/** {@hide} */
		public boolean wakeDisplayGestureEnabled(int user) {
		return boolSettingDefaultOn(Settings.Secure.DOZE_WAKE_DISPLAY_GESTURE, user)
		&& wakeScreenGestureAvailable();
		}

core/java/android/provider/Settings.java

+18 −6

Original line number	Diff line number	Diff line
		@@ -88,6 +88,7 @@ import android.util.ArrayMap;
		import android.util.ArraySet;
		import android.util.Log;
		import android.util.MemoryIntArray;
		import android.view.Display;
		import android.view.inputmethod.InputMethodSystemProperty;

		import com.android.internal.annotations.GuardedBy;
		@@ -4073,7 +4074,7 @@ public final class Settings {
		* preference, this rotation value will be used. Must be one of the
		* {@link android.view.Surface#ROTATION_0 Surface rotation constants}.
		*
		* @see android.view.Display#getRotation
		* @see Display#getRotation
		*/
		public static final String USER_ROTATION = "user_rotation";

		@@ -7733,12 +7734,21 @@ public final class Settings {
		private static final Validator DOZE_TAP_SCREEN_GESTURE_VALIDATOR = BOOLEAN_VALIDATOR;

		/**
		* Gesture that wakes up the display, showing the ambient version of the status bar.
		* Gesture that wakes up the display, showing some version of the lock screen.
		* @hide
		*/
		public static final String DOZE_WAKE_SCREEN_GESTURE = "doze_wake_screen_gesture";
		public static final String DOZE_WAKE_LOCK_SCREEN_GESTURE = "doze_wake_screen_gesture";

		private static final Validator DOZE_WAKE_SCREEN_GESTURE_VALIDATOR = BOOLEAN_VALIDATOR;
		private static final Validator DOZE_WAKE_LOCK_SCREEN_GESTURE_VALIDATOR = BOOLEAN_VALIDATOR;

		/**
		* Gesture that wakes up the display, toggling between {@link Display.STATE_OFF} and
		* {@link Display.STATE_DOZE}.
		* @hide
		*/
		public static final String DOZE_WAKE_DISPLAY_GESTURE = "doze_wake_display_gesture";

		private static final Validator DOZE_WAKE_DISPLAY_GESTURE_VALIDATOR = BOOLEAN_VALIDATOR;

		/**
		* Gesture that skips media.
		@@ -8959,7 +8969,8 @@ public final class Settings {
		DOZE_PICK_UP_GESTURE,
		DOZE_DOUBLE_TAP_GESTURE,
		DOZE_TAP_SCREEN_GESTURE,
		DOZE_WAKE_SCREEN_GESTURE,
		DOZE_WAKE_LOCK_SCREEN_GESTURE,
		DOZE_WAKE_DISPLAY_GESTURE,
		NFC_PAYMENT_DEFAULT_COMPONENT,
		AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,
		FACE_UNLOCK_KEYGUARD_ENABLED,
		@@ -9131,7 +9142,8 @@ 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_SCREEN_GESTURE, DOZE_WAKE_SCREEN_GESTURE_VALIDATOR);
		VALIDATORS.put(DOZE_WAKE_LOCK_SCREEN_GESTURE, DOZE_WAKE_LOCK_SCREEN_GESTURE_VALIDATOR);
		VALIDATORS.put(DOZE_WAKE_DISPLAY_GESTURE, DOZE_WAKE_DISPLAY_GESTURE_VALIDATOR);
		VALIDATORS.put(NFC_PAYMENT_DEFAULT_COMPONENT, NFC_PAYMENT_DEFAULT_COMPONENT_VALIDATOR);
		VALIDATORS.put(AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,
		AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN_VALIDATOR);

packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -127,15 +127,15 @@ public class DozeSensors {
		true /* touchscreen */),
		new PluginSensor(
		new SensorManagerPlugin.Sensor(TYPE_WAKE_DISPLAY),
		Settings.Secure.DOZE_WAKE_SCREEN_GESTURE,
		Settings.Secure.DOZE_WAKE_DISPLAY_GESTURE,
		mConfig.wakeScreenGestureAvailable() && alwaysOn,
		DozeLog.REASON_SENSOR_WAKE_UP,
		false /* reports touch coordinates */,
		false /* touchscreen */),
		new PluginSensor(
		new SensorManagerPlugin.Sensor(TYPE_WAKE_LOCK_SCREEN),
		Settings.Secure.DOZE_WAKE_SCREEN_GESTURE,
		mConfig.wakeScreenGestureAvailable() && alwaysOn,
		Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE,
		mConfig.wakeScreenGestureAvailable(),
		DozeLog.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN,
		false /* reports touch coordinates */,
		false /* touchscreen */, mConfig.getWakeLockScreenDebounce()),