aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordianlujitao <dianlujitao@lineageos.org>2019-08-06 23:59:53 +0800
committerMichael Bestas <mkbestas@lineageos.org>2019-08-20 17:17:28 +0200
commit36a87acd92285d42a3ab024e8f829062f93b495b (patch)
treea53e05ab4fd26602ace80727599750cfa5d161b6
parent73fdcd14ac6fb70838519c6f4bb4d3387d1edd7f (diff)
downloadlineage-sdk-36a87acd92285d42a3ab024e8f829062f93b495b.tar.gz
lineage-sdk-36a87acd92285d42a3ab024e8f829062f93b495b.tar.bz2
lineage-sdk-36a87acd92285d42a3ab024e8f829062f93b495b.zip
OutdoorModeController: Unconditionally enable auto mode on HWC2
* On HWC2, setting "Display mode" to "Automatic" and disabling "Automatic outdoor mode" at the same time makes no difference with setting "Display mode" to "Off" alone. Obviously this is redundant and could confuse the user, so simply ignore the "Automatic outdoor mode" setting on HWC2 to reduce redundancy. Change-Id: I6858571a6b9ded3540fd3d936499878f57a7b3d4
-rw-r--r--lineage/lib/main/java/org/lineageos/platform/internal/display/OutdoorModeController.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/display/OutdoorModeController.java b/lineage/lib/main/java/org/lineageos/platform/internal/display/OutdoorModeController.java
index f25d5afb..fc5e9092 100644
--- a/lineage/lib/main/java/org/lineageos/platform/internal/display/OutdoorModeController.java
+++ b/lineage/lib/main/java/org/lineageos/platform/internal/display/OutdoorModeController.java
@@ -249,9 +249,9 @@ public class OutdoorModeController extends LiveDisplayFeature {
}
boolean isAutomaticOutdoorModeEnabled() {
- return mUseOutdoorMode &&
+ return mUseOutdoorMode && (mNightDisplayAvailable ||
getBoolean(LineageSettings.System.DISPLAY_AUTO_OUTDOOR_MODE,
- getDefaultAutoOutdoorMode());
+ getDefaultAutoOutdoorMode()));
}
boolean getDefaultAutoOutdoorMode() {