diff options
| author | Adrian Roos <roosa@google.com> | 2015-02-04 14:35:23 +0100 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2015-02-04 15:16:04 +0000 |
| commit | 761c156756230d1a8d23841a0b9cee1038696453 (patch) | |
| tree | 570e30441c42493e2e4a1c2fb737c8628c09562e | |
| parent | bf40f24bc24350a4bff49fba89cf12715d15e07c (diff) | |
| download | frameworks_base-761c156756230d1a8d23841a0b9cee1038696453.zip frameworks_base-761c156756230d1a8d23841a0b9cee1038696453.tar.gz frameworks_base-761c156756230d1a8d23841a0b9cee1038696453.tar.bz2 | |
Follow-up to I8a89a10cf2746cefa2feba50dc60c5eccd2ab28d
Bug: 19233606
Change-Id: I394a015371acd124f84f1f6f82bc565fefc669d1
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index de56df1..5b64324 100644 --- a/api/current.txt +++ b/api/current.txt @@ -1412,7 +1412,7 @@ package android { field public static final int windowExitTransition = 16843832; // 0x1010438 field public static final int windowFrame = 16842837; // 0x1010055 field public static final int windowFullscreen = 16843277; // 0x101020d - field public static final int windowHasLightStatusBar = 16843995; // 0x10104db + field public static final int windowHasLightStatusBar = 16843998; // 0x10104de field public static final int windowHideAnimation = 16842935; // 0x10100b7 field public static final int windowIsFloating = 16842839; // 0x1010057 field public static final int windowIsTranslucent = 16842840; // 0x1010058 diff --git a/api/system-current.txt b/api/system-current.txt index fafe657..c62f3bc 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1488,7 +1488,7 @@ package android { field public static final int windowExitTransition = 16843832; // 0x1010438 field public static final int windowFrame = 16842837; // 0x1010055 field public static final int windowFullscreen = 16843277; // 0x101020d - field public static final int windowHasLightStatusBar = 16843995; // 0x10104db + field public static final int windowHasLightStatusBar = 16843998; // 0x10104de field public static final int windowHideAnimation = 16842935; // 0x10100b7 field public static final int windowIsFloating = 16842839; // 0x1010057 field public static final int windowIsTranslucent = 16842840; // 0x1010058 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index f3ad46e..4b1c888 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -2230,8 +2230,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, } if ((diff & View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR) != 0 || sbModeChanged) { - boolean allowLight = (sbMode == MODE_TRANSPARENT - || sbMode == MODE_LIGHTS_OUT_TRANSPARENT); + boolean isTransparentBar = (mStatusBarMode == MODE_TRANSPARENT + || mStatusBarMode == MODE_LIGHTS_OUT_TRANSPARENT); + boolean allowLight = isTransparentBar && !mBatteryController.isPowerSave(); boolean light = (vis & View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR) != 0; mIconController.setIconTint( |