summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2013-08-27 14:23:33 -0400
committerJohn Spurlock <jspurlock@google.com>2013-08-27 14:53:21 -0400
commite47193d8e1795f334bcb29819a571f08bb742c68 (patch)
treea895cb7bab83bdacc7783ba42da3e9852552d2e7 /policy
parentaeda265c4dcdd60484f9d1923e3fdcba761112e0 (diff)
downloadframeworks_base-e47193d8e1795f334bcb29819a571f08bb742c68.zip
frameworks_base-e47193d8e1795f334bcb29819a571f08bb742c68.tar.gz
frameworks_base-e47193d8e1795f334bcb29819a571f08bb742c68.tar.bz2
Rename hideybars constant to SYSTEM_UI_FLAG_IMMERSIVE.
And add more colour to the docs. Bug:10460791 Change-Id: I703d927101bb034ba6dd061e6afd3e1946440fe5
Diffstat (limited to 'policy')
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindowManager.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 8fc6115..55d1917 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -2692,7 +2692,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
final int sysui = mLastSystemUiFlags;
boolean navVisible = (sysui & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0;
boolean navTransparent = (sysui & View.SYSTEM_UI_FLAG_TRANSPARENT_NAVIGATION) != 0;
- boolean transientAllowed = (sysui & View.SYSTEM_UI_FLAG_ALLOW_TRANSIENT) != 0;
+ boolean transientAllowed = (sysui & View.SYSTEM_UI_FLAG_IMMERSIVE) != 0;
navTransparent &= !transientAllowed; // transient trumps transparent
// When the navigation bar isn't visible, we put up a fake
@@ -5054,13 +5054,13 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (statusBarHasFocus) {
int flags = View.SYSTEM_UI_FLAG_FULLSCREEN
| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
- | View.SYSTEM_UI_FLAG_ALLOW_TRANSIENT;
+ | View.SYSTEM_UI_FLAG_IMMERSIVE;
vis = (vis & ~flags) | (mLastSystemUiFlags & flags);
}
// update status bar
boolean transientAllowed =
- (vis & View.SYSTEM_UI_FLAG_ALLOW_TRANSIENT) != 0;
+ (vis & View.SYSTEM_UI_FLAG_IMMERSIVE) != 0;
boolean hideStatusBarWM =
(mFocusedWindow.getAttrs().flags
& WindowManager.LayoutParams.FLAG_FULLSCREEN) != 0;
@@ -5105,7 +5105,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
private boolean isTransientNavigationAllowed(int vis) {
return mNavigationBar != null
&& (vis & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) != 0
- && (vis & View.SYSTEM_UI_FLAG_ALLOW_TRANSIENT) != 0;
+ && (vis & View.SYSTEM_UI_FLAG_IMMERSIVE) != 0;
}
// Temporary helper that allows testing immersive mode on existing apps
@@ -5133,7 +5133,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (sForced.contains(parseActivity(focused))) {
vis |= View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
View.SYSTEM_UI_FLAG_FULLSCREEN |
- View.SYSTEM_UI_FLAG_ALLOW_TRANSIENT;
+ View.SYSTEM_UI_FLAG_IMMERSIVE;
}
return vis;
}