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

Merge "canBeModified accessors for AmbientDisplay pickup setting" into oc-dr1-dev

Browse Source 
am: 7c9a6b502a

Change-Id: I40ced751c59fbc10d0a23a3e06fe66cc59eafd17
This commit is contained in:
Geoffrey Pitsch
2017-07-12 16:59:14 +00:00
committed by android-build-merger
parent 7776b49c13 7c9a6b502a
commit 804322ee01
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/com/android/internal/hardware/AmbientDisplayConfiguration.java
View File

@@ -53,8 +53,8 @@ public class AmbientDisplayConfiguration {
}
public boolean pulseOnPickupEnabled(int user) {
return boolSettingDefaultOn(Settings.Secure.DOZE_PULSE_ON_PICK_UP, user)
&& pulseOnPickupAvailable();
boolean settingEnabled = boolSettingDefaultOn(Settings.Secure.DOZE_PULSE_ON_PICK_UP, user);
return (settingEnabled || alwaysOnEnabled(user)) && pulseOnPickupAvailable();
}
public boolean pulseOnPickupAvailable() {
@@ -62,6 +62,10 @@ public class AmbientDisplayConfiguration {
&& ambientDisplayAvailable();
}
public boolean pulseOnPickupCanBeModified(int user) {
return !alwaysOnEnabled(user);
}
public boolean pulseOnDoubleTapEnabled(int user) {
return boolSettingDefaultOn(Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP, user)
&& pulseOnDoubleTapAvailable();