summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-12-05 09:28:52 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-05 09:28:52 -0800
commitc72728123e9d8a2f3179035e494ebb47afa05f4e (patch)
tree6b504d9fcc7cfe2801aaf178d5a7eb903a223494 /src
parent46a665379a30d755b8197bde4f69ec9261521fd4 (diff)
parent861d52c80430edeb0eba6f73cd0e206e27f4ac6b (diff)
downloadpackages_apps_browser-c72728123e9d8a2f3179035e494ebb47afa05f4e.zip
packages_apps_browser-c72728123e9d8a2f3179035e494ebb47afa05f4e.tar.gz
packages_apps_browser-c72728123e9d8a2f3179035e494ebb47afa05f4e.tar.bz2
am 861d52c8: Merge "Remove unnecessary flags" into ics-mr1
* commit '861d52c80430edeb0eba6f73cd0e206e27f4ac6b': Remove unnecessary flags
Diffstat (limited to 'src')
-rw-r--r--src/com/android/browser/BaseUi.java13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index 88829cc..ca91367 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -749,19 +749,10 @@ public abstract class BaseUi implements UI {
public void setFullscreen(boolean enabled) {
Window win = mActivity.getWindow();
WindowManager.LayoutParams winParams = win.getAttributes();
- final int bits = WindowManager.LayoutParams.FLAG_FULLSCREEN;
+ final int bits = WindowManager.LayoutParams.FLAG_FULLSCREEN
+ | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;
if (enabled) {
winParams.flags |= bits;
- if (mCustomView != null) {
- // 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);
- }
} else {
winParams.flags &= ~bits;
if (mCustomView != null) {