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

Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev

Browse Source
This commit is contained in:
Geoffrey Pitsch
2017-08-01 14:00:22 +00:00
committed by Android (Google) Code Review
parent 7eca0300b9 3ba2623ffe
commit 861b35e1df
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,8 +94,8 @@ public class AmbientDisplayConfiguration {
}
public boolean alwaysOnEnabled(int user) {
return boolSettingDefaultOn(Settings.Secure.DOZE_ALWAYS_ON, user)
&& alwaysOnAvailable();
return boolSettingDefaultOn(Settings.Secure.DOZE_ALWAYS_ON, user) && alwaysOnAvailable()
&& !accessibilityInversionEnabled(user);
}
public boolean alwaysOnAvailable() {
@@ -103,10 +103,18 @@ public class AmbientDisplayConfiguration {
&& ambientDisplayAvailable();
}
public boolean alwaysOnAvailableForUser(int user) {
return alwaysOnAvailable() && !accessibilityInversionEnabled(user);
}
public String ambientDisplayComponent() {
return mContext.getResources().getString(R.string.config_dozeComponent);
}
private boolean accessibilityInversionEnabled(int user) {
return boolSettingDefaultOff(Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, user);
}
private boolean ambientDisplayAvailable() {
return !TextUtils.isEmpty(ambientDisplayComponent());
}