Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AOD: Remove wake up fully config flag

Browse Source 
Fixes: 37270258
Test: Double tap, make sure device does not wake up to lockscreen, only to ambient display
Change-Id: Iaf0c3bfb5dcf566adae7f37b51c866d92bce7a1d
This commit is contained in:
Adrian Roos
2017-04-25 14:28:38 -07:00
parent 9870d0bef7
commit 60a7739798
5 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res/values/strings.xml
View File

@@ -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>

5
packages/SystemUI/res/xml/tuner_prefs.xml
View File

@@ -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

6
packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
View File

@@ -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 =

9
packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
View File

@@ -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));
}

1
packages/SystemUI/tests/src/com/android/systemui/doze/DozeConfigurationUtil.java
View File

@@ -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);