diff options
| author | 2019-01-03 19:52:28 +0000 | |
|---|---|---|
| committer | 2019-01-03 19:52:28 +0000 | |
| commit | 25edac0f179870f71947ff96d98f736f6e7f0027 (patch) | |
| tree | a08c0aa622f1a8b2b1a7de0f55437b21b3208ffd | |
| parent | ecf7b4fed5972d072bdf2e50184d1c90550c0ab7 (diff) | |
| parent | 70bda67f0b35e82b01f90eb6fccaa2ed0d81d044 (diff) | |
Merge "Ignore 'wake display' event when AOD is off"
| -rw-r--r-- | core/java/com/android/internal/hardware/AmbientDisplayConfiguration.java | 7 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/core/java/com/android/internal/hardware/AmbientDisplayConfiguration.java b/core/java/com/android/internal/hardware/AmbientDisplayConfiguration.java index 78d366cd2436..2995a8f43268 100644 --- a/core/java/com/android/internal/hardware/AmbientDisplayConfiguration.java +++ b/core/java/com/android/internal/hardware/AmbientDisplayConfiguration.java @@ -16,14 +16,14 @@ package com.android.internal.hardware; -import com.android.internal.R; - import android.content.Context; import android.os.Build; import android.os.SystemProperties; import android.provider.Settings; import android.text.TextUtils; +import com.android.internal.R; + public class AmbientDisplayConfiguration { private final Context mContext; @@ -37,7 +37,8 @@ public class AmbientDisplayConfiguration { public boolean enabled(int user) { return pulseOnNotificationEnabled(user) || pulseOnLongPressEnabled(user) - || alwaysOnEnabled(user); + || alwaysOnEnabled(user) + || wakeLockScreenGestureEnabled(user); } public boolean pulseOnNotificationEnabled(int user) { diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java b/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java index 04362c17141c..b6fc35553760 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java @@ -85,6 +85,7 @@ public class DozeSensors { mProxCallback = proxCallback; mResolver = mContext.getContentResolver(); + boolean alwaysOn = mConfig.alwaysOnEnabled(UserHandle.USER_CURRENT); mSensors = new TriggerSensor[] { new TriggerSensor( mSensorManager.getDefaultSensor(Sensor.TYPE_SIGNIFICANT_MOTION), @@ -116,7 +117,7 @@ public class DozeSensors { new PluginSensor( new SensorManagerPlugin.Sensor(TYPE_WAKE_DISPLAY), Settings.Secure.DOZE_WAKE_SCREEN_GESTURE, - mConfig.wakeScreenGestureAvailable(), + mConfig.wakeScreenGestureAvailable() && alwaysOn, DozeLog.REASON_SENSOR_WAKE_UP, false /* reports touch coordinates */, false /* touchscreen */), |