commit 9829b43575a4e517a8f7f4aae836bf28728fb85b
author Michael Kolb <kolby@google.com> Sat Jun 04 13:29:00 2011 -0700
committer Michael Kolb <kolby@google.com> Fri Jun 17 15:03:52 2011 -0700
tree 5eb930c3acc4a0aae060d195cb443a082992f8b0
parent 7dc444b4c3b70a09a33c0892fb8677922bdf1ecc

nav mods

Change-Id: I80afd61d8d85b39fdeefacb1303294a33f696b75

src/com/android/browser/NavScreen.java

diff --git a/src/com/android/browser/NavScreen.java b/src/com/android/browser/NavScreen.java
index eeca95a..a841989 100644
--- a/src/com/android/browser/NavScreen.java
+++ b/src/com/android/browser/NavScreen.java
@@ -31,10 +31,13 @@
 import android.widget.Gallery;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ListPopupWindow;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.android.browser.view.Gallery.OnItemSelectedListener;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -57,7 +60,7 @@
     ImageView mFavicon;
     ImageButton mCloseTab;
 
-    NavTabScroller mScroller;
+    NavTabGallery mScroller;
     float mTabAspect = 0.66f;
     int mTabWidth;
     int mTabHeight;
@@ -111,9 +114,9 @@
         if (newconfig.orientation != mOrientation) {
             int selIx = mScroller.getSelectionIndex();
             removeAllViews();
+            mOrientation = newconfig.orientation;
             init();
             mScroller.setSelection(selIx);
-            mOrientation = newconfig.orientation;
             mAdapter.notifyDataSetChanged();
         }
     }
@@ -128,10 +131,11 @@
         mNewTab.setOnClickListener(this);
         mNewIncognito.setOnClickListener(this);
         mMore.setOnClickListener(this);
-        mScroller = (NavTabScroller) findViewById(R.id.scroller);
+        mScroller = (NavTabGallery) findViewById(R.id.scroller);
         mAdapter = new TabAdapter(mContext, mUiController.getTabControl());
         mScroller.setAdapter(mAdapter);
-
+        mScroller.setOrientation(mOrientation == Configuration.ORIENTATION_LANDSCAPE
+                ? LinearLayout.HORIZONTAL : LinearLayout.VERTICAL);
         // update state for active tab
         mScroller.setSelection(mUiController.getTabControl().getTabPosition(mUi.getActiveTab()));
     }
@@ -261,19 +265,13 @@
             tabview.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    if (tabview.isRefresh(v)) {
-                        mUi.hideNavScreen(true);
-                        web.reload();
-                    } else if (tabview.isClose(v)) {
+                    if (tabview.isClose(v)) {
                         onCloseTab((Tab) (mScroller.getSelectedItem()));
                     } else if (tabview.isTitle(v)) {
                         mUi.getTitleBar().setSkipTitleBarAnimations(true);
                         close(false);
                         mUi.editUrl(false);
                         mUi.getTitleBar().setSkipTitleBarAnimations(false);
-                    } else if (tabview.isForward(v)) {
-                        mUi.hideNavScreen(true);
-                        web.goForward();
                     } else if (tabview.isWebView(v)) {
                         mScroller.setSelection(position);
                         close();