From bdc2a2420281c96a09bd00136cf9b1244b35ed2b Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Tue, 7 Sep 2010 13:48:07 -0700
Subject: fixed multiple tabs selected bug, open new tab to home page
 http://b/issue?id=2975213

Change-Id: I21c37cb54ab309568386e0bc5f83a30bb16779b8
---
 src/com/android/browser/BrowserActivity.java | 1 -
 src/com/android/browser/TabScrollView.java   | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/com')

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 9f1f3ba68..d69140f54 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -1317,7 +1317,6 @@ public class BrowserActivity extends Activity
         // doesn't come for action bar buttons
         if (item.getItemId() == R.id.newtab) {
             openTabToHomePage();
-            mHandler.sendMessage(mHandler.obtainMessage(OPEN_BOOKMARKS));
             return true;
         }
         if (!mCanChord) {
diff --git a/src/com/android/browser/TabScrollView.java b/src/com/android/browser/TabScrollView.java
index 13abb505d..b41141679 100644
--- a/src/com/android/browser/TabScrollView.java
+++ b/src/com/android/browser/TabScrollView.java
@@ -113,6 +113,12 @@ public class TabScrollView extends HorizontalScrollView {
     }
 
     void removeTab(View tab) {
+        int ix = mContentView.indexOfChild(tab);
+        if (ix == mSelected) {
+            mSelected = -1;
+        } else if (ix < mSelected) {
+            mSelected--;
+        }
         mContentView.removeView(tab);
     }
 
-- 
cgit v1.2.3