summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adrian Roos <roosa@google.com> 2017-04-11 20:25:54 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-04-11 20:25:59 +0000
commite76f4b0d0b261196559a40ce51651e25addf90bb (patch)
treec3e02a8c5f224a3bf654e73dd4b90836b203c734
parent3f1febbedb31925d2684d07e3a2e2600088f4262 (diff)
parent601fe4aca3b69080ce150fa290aad6f9cf85ff09 (diff)
Merge "Revert "AOD: Wake up fully on gestures by default"" into oc-dev
-rw-r--r--packages/SystemUI/res/xml/tuner_prefs.xml2
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/res/xml/tuner_prefs.xml b/packages/SystemUI/res/xml/tuner_prefs.xml
index 908fb20a45c2..a685c794c5d6 100644
--- a/packages/SystemUI/res/xml/tuner_prefs.xml
+++ b/packages/SystemUI/res/xml/tuner_prefs.xml
@@ -145,7 +145,7 @@
<com.android.systemui.tuner.TunerSwitch
android:key="doze_sensors_wake_up_fully"
android:title="@string/tuner_doze_sensors_wake_up_fully"
- sysui:defValue="true" />
+ sysui:defValue="false" />
</PreferenceScreen>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
index 7b2e9979fb33..c3f8d9711b9c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
@@ -125,7 +125,7 @@ public class DozeParameters {
public boolean getSensorsWakeUpFully() {
return mAmbientDisplayConfiguration.alwaysOnAvailable()
&& Settings.Secure.getIntForUser(mContext.getContentResolver(),
- DOZE_SENSORS_WAKE_UP_FULLY, 1, UserHandle.USER_CURRENT) != 0;
+ DOZE_SENSORS_WAKE_UP_FULLY, 0, UserHandle.USER_CURRENT) != 0;
}
private boolean getBoolean(String propName, int resId) {