diff options
| author | Adrian Roos <roosa@google.com> | 2015-04-28 22:44:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-28 22:45:01 +0000 |
| commit | ca067e9703ab9fcee430d13aac28d04bdc46af2a (patch) | |
| tree | 7314b25996300ec9bc999aee9a44d7c6ad3f978b /core/java/android | |
| parent | fd4e5664528f61b7ac2164ec8ec2206da9deebff (diff) | |
| parent | f4f84c98de630e6346f136ce074af464be6c4a00 (diff) | |
| download | frameworks_base-ca067e9703ab9fcee430d13aac28d04bdc46af2a.zip frameworks_base-ca067e9703ab9fcee430d13aac28d04bdc46af2a.tar.gz frameworks_base-ca067e9703ab9fcee430d13aac28d04bdc46af2a.tar.bz2 | |
Merge "Rename windowLightStatusBar" into mnc-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/PhoneWindow.java | 2 | ||||
| -rw-r--r-- | core/java/android/view/View.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/PhoneWindow.java b/core/java/android/view/PhoneWindow.java index 794c8e7..a3e7a10 100644 --- a/core/java/android/view/PhoneWindow.java +++ b/core/java/android/view/PhoneWindow.java @@ -3599,7 +3599,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { if (!mForcedNavigationBarColor) { mNavigationBarColor = a.getColor(R.styleable.Window_navigationBarColor, 0xFF000000); } - if (a.getBoolean(R.styleable.Window_windowHasLightStatusBar, false)) { + if (a.getBoolean(R.styleable.Window_windowLightStatusBar, false)) { decor.setSystemUiVisibility( decor.getSystemUiVisibility() | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); } diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 9706225..fa74797 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -2592,7 +2592,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * {@link android.view.WindowManager.LayoutParams#FLAG_TRANSLUCENT_STATUS * FLAG_TRANSLUCENT_STATUS}. * - * @see android.R.attr#windowHasLightStatusBar + * @see android.R.attr#windowLightStatusBar */ public static final int SYSTEM_UI_FLAG_LIGHT_STATUS_BAR = 0x00002000; |