commit a4261fd53fef2b311e733fcfee4be3a9967ad967
author Michael Kolb <kolby@google.com> Thu May 05 11:27:37 2011 -0700
committer Michael Kolb <kolby@google.com> Mon May 09 09:40:35 2011 -0700
tree 330f47d4f7f8afc42811e565302eed3422b16869
parent 86138446b4f7c922a650e8bffe62b36adf5210ff

fix navscreen orientation

    handle configuration change in navscreen
    capture actual screen for tabs
    size tabs correctly

Change-Id: I20ff72bdcab13678cdba4c55849bd5ff16cb6568

src/com/android/browser/PhoneUi.java

diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index 13a5257..e838cd4 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -285,12 +285,14 @@
 
     @Override
     protected void captureTab(final Tab tab) {
+        if (tab == null) return;
         if (mUseQuickControls) {
             super.captureTab(tab);
         } else {
-            captureTab(tab,
-                    mActivity.getWindowManager().getDefaultDisplay().getWidth(),
-                    mActivity.getWindowManager().getDefaultDisplay().getHeight());
+            BrowserWebView web = (BrowserWebView) tab.getWebView();
+            if (web != null) {
+                tab.setScreenshot(web.capture());
+            }
         }
     }
 
@@ -301,11 +303,8 @@
         float yoffset = 0;
         WebView web = getWebView();
         if (web != null) {
-            int w = web.getWidth();
-            int h = web.getHeight();
-            yoffset = mNavScreen.getToolbarHeight() -  web.getVisibleTitleHeight();
-            mNavScreen.setTabDimensions((int) (w * NAV_TAB_SCALE),
-                    (int) (h * NAV_TAB_SCALE));
+            yoffset = mNavScreen.getToolbarHeight() -
+                    web.getVisibleTitleHeight();
         }
         // Add the custom view to its container.
         mCustomViewContainer.addView(mNavScreen, COVER_SCREEN_GRAVITY_CENTER);
@@ -366,7 +365,8 @@
             float yoffset = 0;
             WebView web = mNavScreen.getSelectedTab().getWebView();
             if (web != null) {
-                yoffset = mNavScreen.getToolbarHeight() -  web.getVisibleTitleHeight();
+                yoffset = mNavScreen.getToolbarHeight() -
+                        web.getVisibleTitleHeight();
             }
             ObjectAnimator animx = ObjectAnimator.ofFloat(mNavScreen, "scaleX",
                     1.0f, 1 / NAV_TAB_SCALE);