diff options
author | Michael Kolb <kolby@google.com> | 2011-07-13 14:50:56 -0700 |
---|---|---|
committer | Michael Kolb <kolby@google.com> | 2011-07-13 14:51:09 -0700 |
commit | 308b301d37295044c5beac52c5b1a8de0853304f (patch) | |
tree | 00af58dee458f2ca791cb924c78a94e85cb6915e /src/com/android/browser/NavScreen.java | |
parent | ef654f1dd80f55609060005342fc4f2cde62990c (diff) | |
download | android_packages_apps_Gello-308b301d37295044c5beac52c5b1a8de0853304f.tar.gz android_packages_apps_Gello-308b301d37295044c5beac52c5b1a8de0853304f.tar.bz2 android_packages_apps_Gello-308b301d37295044c5beac52c5b1a8de0853304f.zip |
fix tab switcher close/refresh issue
Bug: 5015810
Also fixes the case when closing a tab without changing the
selected position the list would be empty.
Change-Id: Ibf4de0b33c696d14e15b82c07e697b1f1736565a
Diffstat (limited to 'src/com/android/browser/NavScreen.java')
-rw-r--r-- | src/com/android/browser/NavScreen.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/browser/NavScreen.java b/src/com/android/browser/NavScreen.java index 1c35b452..6a51e875 100644 --- a/src/com/android/browser/NavScreen.java +++ b/src/com/android/browser/NavScreen.java @@ -156,8 +156,11 @@ public class NavScreen extends RelativeLayout private void onCloseTab(Tab tab) { if (tab != null) { - switchToSelected(); - mUiController.closeCurrentTab(); + if (tab == mUiController.getCurrentTab()) { + mUiController.closeCurrentTab(); + } else { + mUiController.closeTab(tab); + } mAdapter.notifyDataSetChanged(); } } @@ -229,8 +232,10 @@ public class NavScreen extends RelativeLayout @Override public void onClick(View v) { if (tabview.isClose(v)) { - onCloseTab((Tab) (mScroller.getSelectedItem())); + onCloseTab(tab); } else if (tabview.isTitle(v)) { + mScroller.setSelection(position); + switchToSelected(); mUi.getTitleBar().setSkipTitleBarAnimations(true); close(false); mUi.editUrl(false); @@ -238,7 +243,6 @@ public class NavScreen extends RelativeLayout } else if (tabview.isWebView(v)) { mScroller.setSelection(position); close(); - } } }); |