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

Merge "Add utility methods to AmbientDisplayConfig" into pi-dev

Browse Source 
am: 758cfd63db

Change-Id: Ie4b339c20f7392211142152b34584683072c191d
This commit is contained in:
Matthew Fritze
2018-05-21 16:52:58 -07:00
committed by android-build-merger
parent 7b38e21532 758cfd63db
commit be16482ab0
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,8 +59,11 @@ public class AmbientDisplayConfiguration {
} }
public boolean pulseOnPickupAvailable() { public boolean pulseOnPickupAvailable() {
return mContext.getResources().getBoolean(R.bool.config_dozePulsePickup) return dozePulsePickupSensorAvailable() && ambientDisplayAvailable();
&& ambientDisplayAvailable(); }
public boolean dozePulsePickupSensorAvailable() {
return mContext.getResources().getBoolean(R.bool.config_dozePulsePickup);
} }
public boolean pulseOnPickupCanBeModified(int user) { public boolean pulseOnPickupCanBeModified(int user) {
@@ -73,7 +76,11 @@ public class AmbientDisplayConfiguration {
} }
public boolean pulseOnDoubleTapAvailable() { public boolean pulseOnDoubleTapAvailable() {
return !TextUtils.isEmpty(doubleTapSensorType()) && ambientDisplayAvailable(); return doubleTapSensorAvailable() && ambientDisplayAvailable();
}
public boolean doubleTapSensorAvailable() {
return !TextUtils.isEmpty(doubleTapSensorType());
} }
public String doubleTapSensorType() { public String doubleTapSensorType() {
@@ -115,7 +122,7 @@ public class AmbientDisplayConfiguration {
return boolSettingDefaultOff(Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, user); return boolSettingDefaultOff(Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, user);
} }
private boolean ambientDisplayAvailable() { public boolean ambientDisplayAvailable() {
return !TextUtils.isEmpty(ambientDisplayComponent()); return !TextUtils.isEmpty(ambientDisplayComponent());
} }