summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2011-11-22 08:56:38 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-22 08:56:38 -0800
commitc48c6a173d2789c83eb7fc4bedffd179a50e549d (patch)
treecc8a399ccc6f028e17ed3ff8976cf97e5ccc5069
parentfda0be2e33a0e69e649f8f6dd2e13e70efa61af3 (diff)
parent78ea2875af7145f7a9c167e09b294b7a38acefb5 (diff)
downloadpackages_apps_browser-c48c6a173d2789c83eb7fc4bedffd179a50e549d.zip
packages_apps_browser-c48c6a173d2789c83eb7fc4bedffd179a50e549d.tar.gz
packages_apps_browser-c48c6a173d2789c83eb7fc4bedffd179a50e549d.tar.bz2
am 78ea2875: Merge "Support super-full-screen mode for html5 video" into ics-mr1
* commit '78ea2875af7145f7a9c167e09b294b7a38acefb5': Support super-full-screen mode for html5 video
-rw-r--r--src/com/android/browser/BaseUi.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index e3b620a..88829cc 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -753,7 +753,12 @@ public abstract class BaseUi implements UI {
if (enabled) {
winParams.flags |= bits;
if (mCustomView != null) {
- mCustomView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE);
+ // HTML5 Video can ask for the HIDE_NAVIGATION specifically,
+ // and we want to differentiate it from the flash.
+ if ((mCustomView.getSystemUiVisibility()
+ & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0) {
+ mCustomView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE);
+ }
} else {
mContentView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE);
}