summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2011-11-22 08:54:49 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-22 08:54:49 -0800
commit78ea2875af7145f7a9c167e09b294b7a38acefb5 (patch)
treecc8a399ccc6f028e17ed3ff8976cf97e5ccc5069 /src
parent1107eca13808e8d18ec3612cb94a0b3387a364c3 (diff)
parent0e073e556876ddce41cd6de4e6d237a6a2d024d8 (diff)
downloadpackages_apps_browser-78ea2875af7145f7a9c167e09b294b7a38acefb5.zip
packages_apps_browser-78ea2875af7145f7a9c167e09b294b7a38acefb5.tar.gz
packages_apps_browser-78ea2875af7145f7a9c167e09b294b7a38acefb5.tar.bz2
Merge "Support super-full-screen mode for html5 video" into ics-mr1
Diffstat (limited to 'src')
-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);
}