diff options
| author | Michael Kolb <kolby@google.com> | 2011-08-16 16:23:57 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-16 16:23:57 -0700 |
| commit | 352c02e1adc31d835afbb8dd8910646807164d30 (patch) | |
| tree | b93db813687149c6d21f4d8cf165eb08a1bb0a02 /src | |
| parent | b157656253f19b450cc6f77801791568b1d9f765 (diff) | |
| parent | bf32cd09672a3d1fb845f0bee4942561a3487ce1 (diff) | |
| download | packages_apps_Browser-352c02e1adc31d835afbb8dd8910646807164d30.tar.gz packages_apps_Browser-352c02e1adc31d835afbb8dd8910646807164d30.tar.bz2 packages_apps_Browser-352c02e1adc31d835afbb8dd8910646807164d30.zip | |
Merge "fix hide tab switcher"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/PhoneUi.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java index 23d7abb63..49419aabc 100644 --- a/src/com/android/browser/PhoneUi.java +++ b/src/com/android/browser/PhoneUi.java @@ -327,13 +327,15 @@ public class PhoneUi extends BaseUi { void hideNavScreen(boolean animate) { if (mNavScreen == null) return; final Tab tab = mNavScreen.getSelectedTab(); - if ((tab != null) && !animate) { - finishAnimateOut(tab); + if ((tab == null) || !animate) { + mContentView.setVisibility(View.VISIBLE); + finishAnimateOut(); return; } NavTabView tabview = (NavTabView) mNavScreen.getSelectedTabView(); if (tabview == null) { - finishAnimateOut(tab); + mContentView.setVisibility(View.VISIBLE); + finishAnimateOut(); return; } mUiController.setBlockEvents(true); @@ -375,7 +377,7 @@ public class PhoneUi extends BaseUi { @Override public void onAnimationEnd(Animator anim) { mCustomViewContainer.removeView(screen.mMain); - finishAnimateOut(tab); + finishAnimateOut(); mUiController.setBlockEvents(false); } }); @@ -383,7 +385,7 @@ public class PhoneUi extends BaseUi { animSet.start(); } - private void finishAnimateOut(Tab tab) { + private void finishAnimateOut() { mTabControl.setOnThumbnailUpdatedListener(null); mCustomViewContainer.removeView(mNavScreen); mCustomViewContainer.setAlpha(1f); |