summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBart Sears <bsears@google.com>2011-02-02 10:12:17 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-02 10:12:17 -0800
commitcd7c92482b63717c931198d3b1d787a734146e3c (patch)
tree965dd8ab9872f4e1cc1449b1d47fbbb87007e830 /src
parent9a8e2948fdb23b027994c90219419f0a0831253e (diff)
parentcb9d9d12011dff19c670b8e16a248ea738aca129 (diff)
downloadpackages_apps_Browser-cd7c92482b63717c931198d3b1d787a734146e3c.tar.gz
packages_apps_Browser-cd7c92482b63717c931198d3b1d787a734146e3c.tar.bz2
packages_apps_Browser-cd7c92482b63717c931198d3b1d787a734146e3c.zip
am cb9d9d12: am 4b21788c: Merge "fix menu state after fullscreen video" into honeycomb
* commit 'cb9d9d12011dff19c670b8e16a248ea738aca129': fix menu state after fullscreen video
Diffstat (limited to 'src')
-rw-r--r--src/com/android/browser/Controller.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index a2ddc8c91..07e1ef97e 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -568,6 +568,9 @@ public class Controller
}
protected void onPause() {
+ if (mUi.isCustomViewShowing()) {
+ hideCustomView();
+ }
if (mActivityPaused) {
Log.e(LOGTAG, "BrowserActivity is already paused.");
return;