summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-12-01 02:28:29 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-12-01 02:28:29 -0800
commitd947d472aeb93ee925fada7732f7cde8f0b7c1bc (patch)
tree8b53687b756c3a33a7a79313be0a7f4aa72557c4 /src/com/android
parentafc4f82b643c391d39df4b68745551eff1ffca24 (diff)
parenta4909cba214f3680063367e52044e9d74824c272 (diff)
downloadpackages_apps_Browser-d947d472aeb93ee925fada7732f7cde8f0b7c1bc.tar.gz
packages_apps_Browser-d947d472aeb93ee925fada7732f7cde8f0b7c1bc.tar.bz2
packages_apps_Browser-d947d472aeb93ee925fada7732f7cde8f0b7c1bc.zip
am a4909cba: Hide the custom view when we get onPause() DO NOT MERGE
* commit 'a4909cba214f3680063367e52044e9d74824c272': Hide the custom view when we get onPause() DO NOT MERGE
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/browser/BrowserActivity.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 0a3fec9a4..44ab307a0 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -942,6 +942,10 @@ public class BrowserActivity extends Activity
// unregister network state listener
unregisterReceiver(mNetworkStateIntentReceiver);
WebView.disablePlatformNotifications();
+
+ if (mCustomView != null) {
+ mTabControl.getCurrentWebView().getWebChromeClient().onHideCustomView();
+ }
}
@Override
@@ -2777,7 +2781,6 @@ public class BrowserActivity extends Activity
void onHideCustomView() {
if (mCustomView == null)
return;
-
// Hide the custom view.
mCustomView.setVisibility(View.GONE);
// Remove the custom view from its container.