diff options
Diffstat (limited to 'src/com/android/browser/TabBar.java')
| -rw-r--r-- | src/com/android/browser/TabBar.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/com/android/browser/TabBar.java b/src/com/android/browser/TabBar.java index 7abb203..6c3949a 100644 --- a/src/com/android/browser/TabBar.java +++ b/src/com/android/browser/TabBar.java @@ -16,7 +16,7 @@ package com.android.browser; -import com.android.browser.ScrollWebView.ScrollListener; +import com.android.browser.BrowserWebView.ScrollListener; import android.animation.Animator; import android.animation.Animator.AnimatorListener; @@ -166,7 +166,7 @@ public class TabBar extends LinearLayout TabView tv = buildTabView(tab); mTabs.addTab(tv); } - mTabs.setSelectedTab(mTabControl.getCurrentIndex()); + mTabs.setSelectedTab(mTabControl.getCurrentPosition()); } @Override @@ -213,7 +213,7 @@ public class TabBar extends LinearLayout mUi.hideTitleBar(); } else { mUi.stopWebViewScrolling(); - mUi.showTitleBarAndEdit(); + mUi.editUrl(false); } } else if (mUi.isTitleBarShowing() && !isLoading()) { mUi.stopEditingUrl(); @@ -221,11 +221,12 @@ public class TabBar extends LinearLayout } else { showUrlBar(); } - } else { + } else if (view instanceof TabView) { + final Tab tab = ((TabView) view).mTab; int ix = mTabs.getChildIndex(view); if (ix >= 0) { mTabs.setSelectedTab(ix); - mUiController.switchToTab(ix); + mUiController.switchToTab(tab); } } } @@ -616,7 +617,7 @@ public class TabBar extends LinearLayout // TabChangeListener implementation public void onSetActiveTab(Tab tab) { - mTabs.setSelectedTab(mTabControl.getTabIndex(tab)); + mTabs.setSelectedTab(mTabControl.getTabPosition(tab)); TabView tv = mTabMap.get(tab); if (tv != null) { tv.setProgress(tv.mTab.getLoadProgress()); |