move new tab button next to tabs
http://b/issue?id=3052018
moved tab button
added new tab option to menu
http://b/issue?id=3052583
changed text from window to tab
Change-Id: I079636f29ea529915a5f8c3ad55b4b4c7afe579f
diff --git a/src/com/android/browser/TabScrollView.java b/src/com/android/browser/TabScrollView.java
index 435362d..fcd5a80 100644
--- a/src/com/android/browser/TabScrollView.java
+++ b/src/com/android/browser/TabScrollView.java
@@ -27,10 +27,8 @@
*/
public class TabScrollView extends HorizontalScrollView {
- private Context mContext;
-
+ private BrowserActivity mBrowserActivity;
private LinearLayout mContentView;
-
private int mSelected;
/**
@@ -61,9 +59,9 @@
}
private void init(Context ctx) {
- mContext = ctx;
+ mBrowserActivity = (BrowserActivity)ctx;
setHorizontalScrollBarEnabled(false);
- mContentView = new LinearLayout(mContext);
+ mContentView = new LinearLayout(mBrowserActivity);
mContentView.setOrientation(LinearLayout.HORIZONTAL);
mContentView.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT,
LayoutParams.MATCH_PARENT));
@@ -90,6 +88,10 @@
requestLayout();
}
+ int getChildIndex(View v) {
+ return mContentView.indexOfChild(v);
+ }
+
View getSelectedTab() {
if ((mSelected >= 0) && (mSelected < mContentView.getChildCount())) {
return mContentView.getChildAt(mSelected);
@@ -107,11 +109,6 @@
tab.setActivated(false);
}
- void addTab(View tab, int pos) {
- mContentView.addView(tab, pos);
- tab.setActivated(false);
- }
-
void removeTab(View tab) {
int ix = mContentView.indexOfChild(tab);
if (ix == mSelected) {
@@ -138,5 +135,4 @@
}
}
-
}