commit 01cfcdd0b77d672f5c09d98af683c6732c8250d8
author Cary Clark <cary@android.com> Fri Jun 04 16:36:45 2010 -0400
committer Cary Clark <cary@android.com> Thu Jun 24 16:51:40 2010 -0400
tree f3380fc6d979179fe0562dc9190c0d48a7da0855
parent 61fc77c8eab787cf5e3ecdc3f24b3e89b9fd2a3c

Refactor find and select dialogs

(This is a work in progress -- assets in particular are not final)

Use common code when showing the select and find dialogs. Both
now use similarly constructed contextual action bars and share
resources where possible. Both share a common base class so
supporting code can communicate with either.

Companion changes in frameworks/base and external/webkit

Change-Id: I62e15afd2730444985f8dbd2472df3cae351f47a
http://b/262451

src/com/android/browser/Tab.java

diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 79c4574..8353317 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -1029,6 +1029,16 @@
         }
 
         @Override
+        public void onSelectionDone() {
+            if (mInForeground) mActivity.closeDialogs();
+        }
+
+        @Override
+        public void onSelectionStart() {
+            if (mInForeground) mActivity.showSelectDialog();
+        }
+
+        @Override
         public void onShowCustomView(View view,
                 WebChromeClient.CustomViewCallback callback) {
             if (mInForeground) mActivity.onShowCustomView(view, callback);
@@ -1218,8 +1228,8 @@
         public void onPageStarted(WebView view, String url, Bitmap favicon) {
             // Unlike the others, do not call mClient's version, which would
             // change the progress bar.  However, we do want to remove the
-            // find dialog.
-            if (view.getFindIsUp()) mBrowserActivity.closeFind();
+            // find or select dialog.
+            mBrowserActivity.closeDialogs();
         }
         @Override
         public void doUpdateVisitedHistory(WebView view, String url,
@@ -1420,7 +1430,7 @@
      */
     boolean createSubWindow() {
         if (mSubView == null) {
-            if (mMainView.getFindIsUp()) mActivity.closeFind();
+            mActivity.closeDialogs();
             mSubViewContainer = mInflateService.inflate(
                     R.layout.browser_subwindow, null);
             mSubView = (WebView) mSubViewContainer.findViewById(R.id.webview);
@@ -1468,9 +1478,7 @@
      */
     void dismissSubWindow() {
         if (mSubView != null) {
-            if (mSubView.getFindIsUp()) {
-                mActivity.closeFind();
-            }
+            mActivity.closeDialogs();
             BrowserSettings.getInstance().deleteObserver(
                     mSubView.getSettings());
             mSubView.destroy();
@@ -1495,7 +1503,7 @@
     void removeSubWindow(ViewGroup content) {
         if (mSubView != null) {
             content.removeView(mSubViewContainer);
-            if (mSubView.getFindIsUp()) mActivity.closeFind();
+            mActivity.closeDialogs();
         }
     }
 
@@ -1554,7 +1562,7 @@
                 (FrameLayout) mContainer.findViewById(R.id.webview_wrapper);
         wrapper.removeView(mMainView);
         content.removeView(mContainer);
-        if (mMainView.getFindIsUp()) mActivity.closeFind();
+        mActivity.closeDialogs();
         removeSubWindow(content);
     }
 
@@ -1957,9 +1965,9 @@
     }
 
     /*
-     * Open the find dialog.  Called by BrowserActivity.
+     * Opens the find and select text dialogs.  Called by BrowserActivity.
      */
-    void showFind(FindDialog dialog) {
+    WebView showDialog(WebDialog dialog) {
         LinearLayout container;
         WebView view;
         if (mSubView != null) {
@@ -1975,13 +1983,13 @@
                 ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.WRAP_CONTENT));
         dialog.setWebView(view);
-        view.setFindIsUp(true);
+        return view;
     }
 
     /*
-     * Close the find dialog.  Called by BrowserActivity.closeFind.
+     * Close the find or select dialog. Called by BrowserActivity.closeDialog.
      */
-    void closeFind(FindDialog dialog) {
+    void closeDialog(WebDialog dialog) {
         // The dialog may be attached to the subwindow.  Ensure that the
         // correct parent has it removed.
         LinearLayout parent = (LinearLayout) dialog.getParent();