diff options
author | John Reck <jreck@google.com> | 2011-08-09 16:00:35 -0700 |
---|---|---|
committer | John Reck <jreck@google.com> | 2011-08-09 16:17:21 -0700 |
commit | 8ee633fd62f94cd66c85c2904232d7c9e204cc9c (patch) | |
tree | e451ff70a2367befb1282180d924fa140b8bc2fc /src/com/android/browser/PhoneUi.java | |
parent | 37d9f2f4c540131453b692d6cb17468637dcef9e (diff) | |
download | Browser-8ee633fd62f94cd66c85c2904232d7c9e204cc9c.tar.gz |
Reduce capture frequency
Bug: 5142655
Only capture while the navscreen is visible
Fix Tab.capture to never capture the title bar
Fix navscreen not responding to updated thumbnails
Change-Id: Id48ad32bb131c398c7d1ce4243e92f04cd421ade
Diffstat (limited to 'src/com/android/browser/PhoneUi.java')
-rw-r--r-- | src/com/android/browser/PhoneUi.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java index 32bc0923..f33dbef6 100644 --- a/src/com/android/browser/PhoneUi.java +++ b/src/com/android/browser/PhoneUi.java @@ -17,7 +17,6 @@ package com.android.browser; import android.app.Activity; -import android.content.Context; import android.os.Bundle; import android.util.Log; import android.view.ActionMode; @@ -27,7 +26,6 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.accessibility.AccessibilityEvent; -import android.view.accessibility.AccessibilityManager; import android.webkit.WebView; import android.widget.FrameLayout; @@ -112,6 +110,8 @@ public class PhoneUi extends BaseUi { @Override public void setActiveTab(final Tab tab) { + mTitleBar.cancelTitleBarAnimation(true); + mTitleBar.setSkipTitleBarAnimations(true); super.setActiveTab(tab); BrowserWebView view = (BrowserWebView) tab.getWebView(); // TabControl.setCurrentTab has been called before this, @@ -138,6 +138,7 @@ public class PhoneUi extends BaseUi { mNavigationBar.onStateChanged(StateListener.STATE_NORMAL); updateLockIconToLatest(tab); tab.getTopWindow().requestFocus(); + mTitleBar.setSkipTitleBarAnimations(false); } /** @@ -269,6 +270,7 @@ public class PhoneUi extends BaseUi { } void showNavScreen() { + mActiveTab.capture(); detachTab(mActiveTab); mNavScreen = new NavScreen(mActivity, mUiController, this); // Add the custom view to its container. @@ -278,10 +280,12 @@ public class PhoneUi extends BaseUi { mCustomViewContainer.bringToFront(); // notify accessibility manager about the screen change mNavScreen.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED); + mTabControl.setOnThumbnailUpdatedListener(mNavScreen); } void hideNavScreen(boolean animate) { if (mNavScreen == null) return; + mTabControl.setOnThumbnailUpdatedListener(null); Tab tab = mNavScreen.getSelectedTab(); mCustomViewContainer.removeView(mNavScreen); mNavScreen = null; |