Implement pseudo 3d overscroll for tab switcher
Bug: 5255100
Change-Id: Id756e36bba2644cc1be1a699f80dbd78119ec56f
diff --git a/src/com/android/browser/NavScreen.java b/src/com/android/browser/NavScreen.java
index 768f9ba..1626183 100644
--- a/src/com/android/browser/NavScreen.java
+++ b/src/com/android/browser/NavScreen.java
@@ -37,9 +37,9 @@
import android.widget.RelativeLayout;
import android.widget.TextView;
-import com.android.browser.NavTabGallery.OnRemoveListener;
+import com.android.browser.NavTabScroller.OnLayoutListener;
+import com.android.browser.NavTabScroller.OnRemoveListener;
import com.android.browser.TabControl.OnThumbnailUpdatedListener;
-import com.android.browser.view.Gallery.OnScrollFinishedListener;
import java.util.HashMap;
@@ -47,9 +47,6 @@
implements OnClickListener, OnMenuItemClickListener, OnThumbnailUpdatedListener {
- private static final int SCROLL_MIN = 200;
- private static final int SCROLL_FACTOR = 20;
-
UiController mUiController;
PhoneUi mUi;
Tab mTab;
@@ -66,7 +63,7 @@
ImageView mFavicon;
ImageButton mCloseTab;
- NavTabGallery mScroller;
+ NavTabScroller mScroller;
TabAdapter mAdapter;
int mOrientation;
boolean mNeedsMenu;
@@ -81,22 +78,18 @@
init();
}
- protected Tab getSelectedTab() {
- return (Tab) mScroller.getSelectedItem();
- }
-
protected void showMenu() {
PopupMenu popup = new PopupMenu(mContext, mMore);
Menu menu = popup.getMenu();
popup.getMenuInflater().inflate(R.menu.browser, menu);
- mUiController.updateMenuState(mScroller.getSelectedItem(), menu);
+ mUiController.updateMenuState(mUiController.getCurrentTab(), menu);
popup.setOnMenuItemClickListener(this);
popup.show();
}
@Override
public boolean onMenuItemClick(MenuItem item) {
- mUi.hideNavScreen(false);
+ mUi.hideNavScreen(mUiController.getTabControl().getCurrentPosition(), false);
return mUiController.onOptionsItemSelected(item);
}
@@ -104,15 +97,14 @@
return mActivity.getResources().getDimension(R.dimen.toolbar_height);
}
- // for configuration changes
@Override
protected void onConfigurationChanged(Configuration newconfig) {
if (newconfig.orientation != mOrientation) {
- int selIx = mScroller.getSelectionIndex();
+ int sv = mScroller.getScrollValue();
removeAllViews();
mOrientation = newconfig.orientation;
init();
- mScroller.setSelection(selIx);
+ mScroller.setScrollValue(sv);
mAdapter.notifyDataSetChanged();
}
}
@@ -127,7 +119,7 @@
mBookmarks.setOnClickListener(this);
mNewTab.setOnClickListener(this);
mMore.setOnClickListener(this);
- mScroller = (NavTabGallery) findViewById(R.id.scroller);
+ mScroller = (NavTabScroller) findViewById(R.id.scroller);
TabControl tc = mUiController.getTabControl();
mTabViews = new HashMap<Tab, View>(tc.getTabCount());
mAdapter = new TabAdapter(mContext, tc);
@@ -150,28 +142,12 @@
@Override
public void onClick(View v) {
- WebView web = (mTab != null) ? mTab.getWebView() : null;
- if (web != null) {
- if (mForward == v) {
- mUi.hideNavScreen(true);
- mTab.goForward();
- } else if (mRefresh == v) {
- mUi.hideNavScreen(true);
- web.reload();
- }
- }
if (mBookmarks == v) {
- switchToSelected();
mUiController.bookmarksOrHistoryPicker(false);
} else if (mNewTab == v) {
openNewTab();
} else if (mMore == v) {
showMenu();
- } else if (mTitle == v) {
- mUi.getTitleBar().setSkipTitleBarAnimations(true);
- close(false);
- mUi.editUrl(false);
- mUi.getTitleBar().setSkipTitleBarAnimations(false);
}
}
@@ -182,49 +158,46 @@
} else {
mUiController.closeTab(tab);
}
- mAdapter.notifyDataSetChanged();
+ mScroller.handleDataChanged();
}
}
private void openNewTab() {
// need to call openTab explicitely with setactive false
- Tab tab = mUiController.openTab(BrowserSettings.getInstance().getHomePage(),
+ final Tab tab = mUiController.openTab(BrowserSettings.getInstance().getHomePage(),
false, false, false);
- int duration = 0;
if (tab != null) {
mUiController.setBlockEvents(true);
- int oldsel = mScroller.getSelectedItemPosition();
final int tix = mUi.mTabControl.getTabPosition(tab);
- duration = SCROLL_MIN + SCROLL_FACTOR * Math.abs(oldsel - tix);
- mScroller.handleDataChanged();
- mScroller.smoothScrollToPosition(tix, duration, new OnScrollFinishedListener() {
+ mScroller.setOnLayoutListener(new OnLayoutListener() {
+
@Override
- public void onScrollFinished() {
- mUiController.setBlockEvents(false);
- mUi.hideNavScreen(true);
- switchToSelected();
+ public void onLayout(int l, int t, int r, int b) {
+ mUi.hideNavScreen(tix, true);
+ switchToTab(tab);
}
});
+ mScroller.handleDataChanged(tix);
+ mUiController.setBlockEvents(false);
}
}
- View getSelectedTabView() {
- return mScroller.getSelectedTab();
- }
-
- private void switchToSelected() {
- Tab tab = (Tab) mScroller.getSelectedItem();
+ private void switchToTab(Tab tab) {
if (tab != mUi.getActiveTab()) {
mUiController.setActiveTab(tab);
}
}
- protected void close() {
- close(true);
+ protected void close(int position) {
+ close(position, true);
}
- protected void close(boolean animate) {
- mUi.hideNavScreen(animate);
+ protected void close(int position, boolean animate) {
+ mUi.hideNavScreen(position, animate);
+ }
+
+ protected NavTabView getTabView(int pos) {
+ return mScroller.getTabView(pos);
}
class TabAdapter extends BaseAdapter {
@@ -263,15 +236,13 @@
if (tabview.isClose(v)) {
mScroller.animateOut(tabview);
} else if (tabview.isTitle(v)) {
- mScroller.setSelection(position);
- switchToSelected();
+ switchToTab(tab);
mUi.getTitleBar().setSkipTitleBarAnimations(true);
- close(false);
+ close(position, false);
mUi.editUrl(false);
mUi.getTitleBar().setSkipTitleBarAnimations(false);
} else if (tabview.isWebView(v)) {
- mScroller.setSelection(position);
- close();
+ close(position);
}
}
});
@@ -285,7 +256,6 @@
View v = mTabViews.get(t);
if (v != null) {
v.invalidate();
- mScroller.invalidate();
}
}