am 93265e4b: am ea5e14db: Merge "Unused variables in AddNewBookmark"
* commit '93265e4ba4521ed8e6f685fec38ee0f2fd9f3697':
Unused variables in AddNewBookmark
diff --git a/res/drawable-mdpi/ic_btn_copy.png b/res/drawable-mdpi/ic_btn_copy.png
new file mode 100644
index 0000000..2174368
--- /dev/null
+++ b/res/drawable-mdpi/ic_btn_copy.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_btn_find.png b/res/drawable-mdpi/ic_btn_find.png
new file mode 100644
index 0000000..71bc61a
--- /dev/null
+++ b/res/drawable-mdpi/ic_btn_find.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_btn_select_all.png b/res/drawable-mdpi/ic_btn_select_all.png
new file mode 100644
index 0000000..8ce8c8f
--- /dev/null
+++ b/res/drawable-mdpi/ic_btn_select_all.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_btn_share.png b/res/drawable-mdpi/ic_btn_share.png
new file mode 100644
index 0000000..7262acf
--- /dev/null
+++ b/res/drawable-mdpi/ic_btn_share.png
Binary files differ
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 0a3fec9..44ab307 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -942,6 +942,10 @@
// unregister network state listener
unregisterReceiver(mNetworkStateIntentReceiver);
WebView.disablePlatformNotifications();
+
+ if (mCustomView != null) {
+ mTabControl.getCurrentWebView().getWebChromeClient().onHideCustomView();
+ }
}
@Override
@@ -2777,7 +2781,6 @@
void onHideCustomView() {
if (mCustomView == null)
return;
-
// Hide the custom view.
mCustomView.setVisibility(View.GONE);
// Remove the custom view from its container.