summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Reck <jreck@android.com>2012-09-04 14:53:00 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-09-04 14:53:00 -0700
commit922afab3f6044ff38c78d1d991c74ca003f90302 (patch)
treeb75bf0f8e45f0eb89d63d912342832a1c70c2ed8 /src
parentcf00c263557e1bd8ba060938cf8a451f2b92af2c (diff)
parent2230a3146c4d99ab5927c8f740c5bd09927e9da6 (diff)
downloadpackages_apps_browser-922afab3f6044ff38c78d1d991c74ca003f90302.zip
packages_apps_browser-922afab3f6044ff38c78d1d991c74ca003f90302.tar.gz
packages_apps_browser-922afab3f6044ff38c78d1d991c74ca003f90302.tar.bz2
Merge "No search pane while tapping search button after backing to "windows" view from "saved page" view."
Diffstat (limited to 'src')
-rw-r--r--src/com/android/browser/PhoneUi.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index e3c22bd..89eae70 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -54,6 +54,7 @@ public class PhoneUi extends BaseUi {
private int mActionBarHeight;
boolean mAnimating;
+ boolean mShowNav = false;
/**
* @param browser
@@ -80,6 +81,8 @@ public class PhoneUi extends BaseUi {
if (mUseQuickControls) {
mTitleBar.setShowProgressOnly(false);
}
+ //Do nothing while at Nav show screen.
+ if (mShowNav) return;
super.editUrl(clearInput, forceIME);
}
@@ -131,6 +134,12 @@ public class PhoneUi extends BaseUi {
mTitleBar.cancelTitleBarAnimation(true);
mTitleBar.setSkipTitleBarAnimations(true);
super.setActiveTab(tab);
+
+ //if at Nav screen show, detach tab like what showNavScreen() do.
+ if (mShowNav) {
+ detachTab(mActiveTab);
+ }
+
BrowserWebView view = (BrowserWebView) tab.getWebView();
// TabControl.setCurrentTab has been called before this,
// so the tab is guaranteed to have a webview
@@ -254,6 +263,7 @@ public class PhoneUi extends BaseUi {
}
void showNavScreen() {
+ mShowNav = true;
mUiController.setBlockEvents(true);
if (mNavScreen == null) {
mNavScreen = new NavScreen(mActivity, mUiController, this);
@@ -334,6 +344,7 @@ public class PhoneUi extends BaseUi {
}
void hideNavScreen(int position, boolean animate) {
+ mShowNav = false;
if (!showingNavScreen()) return;
final Tab tab = mUiController.getTabControl().getTab(position);
if ((tab == null) || !animate) {