summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jason Monk <jmonk@google.com> 2017-09-11 19:03:07 +0000
committer android-build-merger <android-build-merger@google.com> 2017-09-11 19:03:07 +0000
commite9c5d8aad684b51ff33983d2e267da4e2ddbe6cb (patch)
tree8c2b04fbaa074930be3aac4cb1c3cd9876ab9e62
parent94a3a079c30b27d46a6d081422e7f573c4548b76 (diff)
parent07d0b9391411cfd869f5f5eb99b66dc38da0d050 (diff)
Merge "Fix broken window flag" into oc-mr1-dev
am: 07d0b93914 Change-Id: I4d9079422e05b117b3d25ac1a0d9fa884eadee23
-rw-r--r--core/java/com/android/internal/policy/PhoneWindow.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/com/android/internal/policy/PhoneWindow.java b/core/java/com/android/internal/policy/PhoneWindow.java
index 5f1932c9cfff..b13560c10326 100644
--- a/core/java/com/android/internal/policy/PhoneWindow.java
+++ b/core/java/com/android/internal/policy/PhoneWindow.java
@@ -2456,6 +2456,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
decor.setSystemUiVisibility(
decor.getSystemUiVisibility() | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
}
+ if (a.getBoolean(R.styleable.Window_windowLightNavigationBar, false)) {
+ decor.setSystemUiVisibility(
+ decor.getSystemUiVisibility() | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
+ }
if (mAlwaysReadCloseOnTouchAttr || getContext().getApplicationInfo().targetSdkVersion
>= android.os.Build.VERSION_CODES.HONEYCOMB) {