diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-14 07:12:22 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-14 07:12:22 -0800 |
| commit | c06a2da38a76eac4221f47cf17fccb27dc757fed (patch) | |
| tree | 238dea17f4dc7b9f5e96c327b76860cabcd27866 /src | |
| parent | 49b11f97360fea3bb37fc5cc3703587deaf32f00 (diff) | |
| parent | 8ff57db0a8dc8eb659fbcdcd4a856208609e6070 (diff) | |
| download | packages_apps_browser-c06a2da38a76eac4221f47cf17fccb27dc757fed.zip packages_apps_browser-c06a2da38a76eac4221f47cf17fccb27dc757fed.tar.gz packages_apps_browser-c06a2da38a76eac4221f47cf17fccb27dc757fed.tar.bz2 | |
Merge change I4c7be8c7 into eclair-mr2
* changes:
Notify the WebView that its customView is not being displayed instead of failing silently.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index d39d897..462e434 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -2582,8 +2582,11 @@ public class BrowserActivity extends Activity } void onShowCustomView(View view, WebChromeClient.CustomViewCallback callback) { - if (mCustomView != null) + // if a view already exists then immediately terminate the new one + if (mCustomView != null) { + callback.onCustomViewHidden(); return; + } // Add the custom view to its container. mCustomViewContainer.addView(view, COVER_SCREEN_GRAVITY_CENTER); |