commit 9ef259af433edc5aeb11b5d5d94dc9acc697c61e
author Michael Kolb <kolby@google.com> Tue Jul 12 15:33:08 2011 -0700
committer Michael Kolb <kolby@google.com> Tue Jul 12 16:32:04 2011 -0700
tree 132cb497cbdac4c0f5d90e3d3c3ce09756392e76
parent 9cfe5244059ec719973fc465b5d2f536ea597bdf

use screenshots for tab switcher

    also removed the old tab switcher code

Change-Id: Id84ff64e42e5e1f70f55e136efdf84270c1a4b7b

src/com/android/browser/PhoneUi.java

diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index f32308d..f2d5da0 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -34,7 +34,6 @@
 
     private static final String LOGTAG = "PhoneUi";
 
-    private ActiveTabsPage mActiveTabsPage;
     private PieControlPhone mPieControl;
     private NavScreen mNavScreen;
     private NavigationBarPhone mNavigationBar;
@@ -60,20 +59,6 @@
         mActivity.getActionBar().hide();
     }
 
-    // lifecycle
-
-    @Override
-    public void onPause() {
-        // FIXME: This removes the active tabs page and resets the menu to
-        // MAIN_MENU.  A better solution might be to do this work in onNewIntent
-        // but then we would need to save it in onSaveInstanceState and restore
-        // it in onCreate/onRestoreInstanceState
-        if (mActiveTabsPage != null) {
-            mUiController.removeActiveTabsPage(true);
-        }
-        super.onPause();
-    }
-
     @Override
     public void onDestroy() {
         hideTitleBar();
@@ -89,11 +74,7 @@
 
     @Override
     public boolean onBackKey() {
-        if (mActiveTabsPage != null) {
-            // if tab page is showing, hide it
-            mUiController.removeActiveTabsPage(true);
-            return true;
-        } else if (mNavScreen != null) {
+        if (mNavScreen != null) {
             mNavScreen.close();
             return true;
         }
@@ -147,7 +128,6 @@
 
     @Override
     public void setActiveTab(final Tab tab) {
-        captureTab(mActiveTab);
         super.setActiveTab(tab);
         BrowserWebView view = (BrowserWebView) tab.getWebView();
         // TabControl.setCurrentTab has been called before this,
@@ -186,28 +166,6 @@
         }
     }
 
-    // active tabs page
-
-    @Override
-    public void showActiveTabsPage() {
-        captureTab(mActiveTab);
-        mActiveTabsPage = new ActiveTabsPage(mActivity, mUiController);
-        mTitleBar.setVisibility(View.GONE);
-        hideTitleBar();
-        mContentView.addView(mActiveTabsPage, COVER_SCREEN_PARAMS);
-        mActiveTabsPage.requestFocus();
-    }
-
-    /**
-     * Remove the active tabs page.
-     */
-    @Override
-    public void removeActiveTabsPage() {
-        mContentView.removeView(mActiveTabsPage);
-        mTitleBar.setVisibility(View.VISIBLE);
-        mActiveTabsPage = null;
-    }
-
     @Override
     public void showComboView(ComboViews startWith, Bundle extras) {
         if (mNavScreen != null) {
@@ -216,11 +174,6 @@
         super.showComboView(startWith, extras);
     }
 
-    @Override
-    public boolean showsWeb() {
-        return super.showsWeb() && mActiveTabsPage == null;
-    }
-
     // menu handling callbacks
 
     @Override
@@ -292,15 +245,6 @@
         }
     }
 
-    @Override
-    protected void captureTab(final Tab tab) {
-        if (tab == null) return;
-        BrowserWebView web = (BrowserWebView) tab.getWebView();
-        if (web != null) {
-            tab.setScreenshot(web.capture());
-        }
-    }
-
     void showNavScreen() {
         detachTab(mActiveTab);
         mNavScreen = new NavScreen(mActivity, mUiController, this);