From 60a7739798f1637fdae6b50198dad285e162e663 Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Tue, 25 Apr 2017 14:28:38 -0700
Subject: [PATCH] AOD: Remove wake up fully config flag

Fixes: 37270258
Test: Double tap, make sure device does not wake up to lockscreen, only to ambient display
Change-Id: Iaf0c3bfb5dcf566adae7f37b51c866d92bce7a1d
---
 packages/SystemUI/res/values/strings.xml                         | 4 ----
 packages/SystemUI/res/xml/tuner_prefs.xml                        | 5 -----
 .../SystemUI/src/com/android/systemui/doze/DozeTriggers.java     | 6 +-----
 .../src/com/android/systemui/statusbar/phone/DozeParameters.java | 9 ---------
 .../src/com/android/systemui/doze/DozeConfigurationUtil.java     | 1 -
 5 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 9fb884e958af..4777ba52c58e 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -1861,10 +1861,6 @@
         not appear on production builds ever. -->
     <string name="tuner_doze" translatable="false">Ambient Display</string>
 
-    <!-- Ambient display, Sensors wake up device of the tuner. Non-translatable since it should
-        not appear on production builds ever. -->
-    <string name="tuner_doze_sensors_wake_up_fully" translatable="false">Wake up device on double tap or lift</string>
-
     <!-- Ambient display always-on of the tuner. Non-translatable since it should
         not appear on production builds ever. -->
     <string name="tuner_doze_always_on" translatable="false">Always on</string>
diff --git a/packages/SystemUI/res/xml/tuner_prefs.xml b/packages/SystemUI/res/xml/tuner_prefs.xml
index a685c794c5d6..1281e5759d28 100644
--- a/packages/SystemUI/res/xml/tuner_prefs.xml
+++ b/packages/SystemUI/res/xml/tuner_prefs.xml
@@ -142,11 +142,6 @@
           android:title="@string/tuner_doze_always_on"
           sysui:defValue="false" />
 
-        <com.android.systemui.tuner.TunerSwitch
-          android:key="doze_sensors_wake_up_fully"
-          android:title="@string/tuner_doze_sensors_wake_up_fully"
-          sysui:defValue="false" />
-
     </PreferenceScreen>
 
     <Preference
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
index ea55c5f8bd6e..2096956e8c8f 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
@@ -99,11 +99,7 @@ public class DozeTriggers implements DozeMachine.Part {
     }
 
     private void onSensor(int pulseReason, boolean sensorPerformedProxCheck) {
-        if (mDozeParameters.getSensorsWakeUpFully()) {
-            mMachine.wakeUp();
-        } else {
-            requestPulse(pulseReason, sensorPerformedProxCheck);
-        }
+        requestPulse(pulseReason, sensorPerformedProxCheck);
 
         if (pulseReason == DozeLog.PULSE_REASON_SENSOR_PICKUP) {
             final long timeSinceNotification =
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 40776ea92db7..e1ca929752ef 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
@@ -59,9 +59,6 @@ public class DozeParameters {
         pw.print("    getPickupVibrationThreshold(): "); pw.println(getPickupVibrationThreshold());
         pw.print("    getPickupSubtypePerformsProxCheck(): ");pw.println(
                 dumpPickupSubtypePerformsProxCheck());
-        if (mAmbientDisplayConfiguration.alwaysOnAvailable()) {
-            pw.print("    getSensorsWakeUpFully(): "); pw.println(getSensorsWakeUpFully());
-        }
     }
 
     private String dumpPickupSubtypePerformsProxCheck() {
@@ -122,12 +119,6 @@ public class DozeParameters {
         return mAmbientDisplayConfiguration.alwaysOnEnabled(UserHandle.USER_CURRENT);
     }
 
-    public boolean getSensorsWakeUpFully() {
-        return mAmbientDisplayConfiguration.alwaysOnAvailable()
-                && Settings.Secure.getIntForUser(mContext.getContentResolver(),
-                DOZE_SENSORS_WAKE_UP_FULLY, 0, UserHandle.USER_CURRENT) != 0;
-    }
-
     private boolean getBoolean(String propName, int resId) {
         return SystemProperties.getBoolean(propName, mContext.getResources().getBoolean(resId));
     }
diff --git a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeConfigurationUtil.java b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeConfigurationUtil.java
index 3aef2478ecae..62d80ace39df 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeConfigurationUtil.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeConfigurationUtil.java
@@ -33,7 +33,6 @@ public class DozeConfigurationUtil {
         DozeParameters params = mock(DozeParameters.class, noDefaultAnswer(doneHolder));
 
         when(params.getPulseOnSigMotion()).thenReturn(false);
-        when(params.getSensorsWakeUpFully()).thenReturn(false);
         when(params.getPickupVibrationThreshold()).thenReturn(0);
         when(params.getProxCheckBeforePulse()).thenReturn(true);
         when(params.getPickupSubtypePerformsProxCheck(anyInt())).thenReturn(true);
-- 
2.11.0