diff options
author | John Reck <jreck@google.com> | 2011-08-10 15:53:07 -0700 |
---|---|---|
committer | John Reck <jreck@google.com> | 2011-08-11 10:29:45 -0700 |
commit | 2d963a2899afbe000d1ab498f94de87f25e33184 (patch) | |
tree | 12c78e12a35dd5de8b0673768f25e8fb688d6dfd /src/com/android/browser/ComboViewActivity.java | |
parent | e3da7d615be4710da92a79e6ed70dc1982deda4c (diff) | |
download | android_packages_apps_Gello-2d963a2899afbe000d1ab498f94de87f25e33184.tar.gz android_packages_apps_Gello-2d963a2899afbe000d1ab498f94de87f25e33184.tar.bz2 android_packages_apps_Gello-2d963a2899afbe000d1ab498f94de87f25e33184.zip |
Support horizontal swipe in combo activity
Bug: 5145315
Change-Id: I1e9b4a6bae325244c7a3fb6159deadc3fcf170e6
Diffstat (limited to 'src/com/android/browser/ComboViewActivity.java')
-rw-r--r-- | src/com/android/browser/ComboViewActivity.java | 165 |
1 files changed, 152 insertions, 13 deletions
diff --git a/src/com/android/browser/ComboViewActivity.java b/src/com/android/browser/ComboViewActivity.java index cea18849..9bdce185 100644 --- a/src/com/android/browser/ComboViewActivity.java +++ b/src/com/android/browser/ComboViewActivity.java @@ -15,18 +15,26 @@ */ package com.android.browser; +import android.app.ActionBar; import android.app.Activity; +import android.app.Fragment; +import android.app.FragmentTransaction; +import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; +import android.support.v13.app.FragmentPagerAdapter; +import android.support.v4.view.ViewPager; import android.view.Menu; import android.view.MenuItem; -import com.android.browser.CombinedBookmarkHistoryView.CombinedBookmarksCallbacks; import com.android.browser.UI.ComboViews; +import java.util.ArrayList; + public class ComboViewActivity extends Activity implements CombinedBookmarksCallbacks { + private static final String STATE_SELECTED_TAB = "tab"; public static final String EXTRA_COMBO_ARGS = "combo_args"; public static final String EXTRA_INITIAL_VIEW = "initial_view"; @@ -34,8 +42,8 @@ public class ComboViewActivity extends Activity implements CombinedBookmarksCall public static final String EXTRA_OPEN_ALL = "open_all"; public static final String EXTRA_CURRENT_URL = "url"; public static final String EXTRA_BOOKMARK_PAGE = "create_bookmark"; - - private CombinedBookmarkHistoryView mComboView; + private ViewPager mViewPager; + private TabsAdapter mTabsAdapter; @Override protected void onCreate(Bundle savedInstanceState) { @@ -47,9 +55,50 @@ public class ComboViewActivity extends Activity implements CombinedBookmarksCall ComboViews startingView = svStr != null ? ComboViews.valueOf(svStr) : ComboViews.Bookmarks; - mComboView = new CombinedBookmarkHistoryView(this, this, - startingView, args); - setContentView(mComboView); + mViewPager = new ViewPager(this); + mViewPager.setId(R.id.tab_view); + setContentView(mViewPager); + + final ActionBar bar = getActionBar(); + bar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS); + if (BrowserActivity.isTablet(this)) { + bar.setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME + | ActionBar.DISPLAY_USE_LOGO); + } else { + bar.setDisplayOptions(0); + } + + mTabsAdapter = new TabsAdapter(this, mViewPager); + mTabsAdapter.addTab(bar.newTab().setText(R.string.tab_bookmarks), + BrowserBookmarksPage.class, args); + mTabsAdapter.addTab(bar.newTab().setText(R.string.tab_history), + BrowserHistoryPage.class, args); + mTabsAdapter.addTab(bar.newTab().setText(R.string.tab_snapshots), + BrowserSnapshotPage.class, args); + + if (savedInstanceState != null) { + bar.setSelectedNavigationItem( + savedInstanceState.getInt(STATE_SELECTED_TAB, 0)); + } else { + switch (startingView) { + case Bookmarks: + mViewPager.setCurrentItem(0); + break; + case History: + mViewPager.setCurrentItem(1); + break; + case Snapshots: + mViewPager.setCurrentItem(2); + break; + } + } + } + + @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + outState.putInt(STATE_SELECTED_TAB, + getActionBar().getSelectedNavigationIndex()); } @Override @@ -81,13 +130,6 @@ public class ComboViewActivity extends Activity implements CombinedBookmarksCall } @Override - public void onBackPressed() { - if (!mComboView.onBackPressed()) { - super.onBackPressed(); - } - } - - @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.combined, menu); return super.onCreateOptionsMenu(menu); @@ -107,4 +149,101 @@ public class ComboViewActivity extends Activity implements CombinedBookmarksCall } return super.onOptionsItemSelected(item); } + + /** + * This is a helper class that implements the management of tabs and all + * details of connecting a ViewPager with associated TabHost. It relies on a + * trick. Normally a tab host has a simple API for supplying a View or + * Intent that each tab will show. This is not sufficient for switching + * between pages. So instead we make the content part of the tab host + * 0dp high (it is not shown) and the TabsAdapter supplies its own dummy + * view to show as the tab content. It listens to changes in tabs, and takes + * care of switch to the correct page in the ViewPager whenever the selected + * tab changes. + */ + public static class TabsAdapter extends FragmentPagerAdapter + implements ActionBar.TabListener, ViewPager.OnPageChangeListener { + private final Context mContext; + private final ActionBar mActionBar; + private final ViewPager mViewPager; + private final ArrayList<TabInfo> mTabs = new ArrayList<TabInfo>(); + + static final class TabInfo { + private final Class<?> clss; + private final Bundle args; + + TabInfo(Class<?> _class, Bundle _args) { + clss = _class; + args = _args; + } + } + + public TabsAdapter(Activity activity, ViewPager pager) { + super(activity.getFragmentManager()); + mContext = activity; + mActionBar = activity.getActionBar(); + mViewPager = pager; + mViewPager.setAdapter(this); + mViewPager.setOnPageChangeListener(this); + } + + public void addTab(ActionBar.Tab tab, Class<?> clss, Bundle args) { + TabInfo info = new TabInfo(clss, args); + tab.setTag(info); + tab.setTabListener(this); + mTabs.add(info); + mActionBar.addTab(tab); + notifyDataSetChanged(); + } + + @Override + public int getCount() { + return mTabs.size(); + } + + @Override + public Fragment getItem(int position) { + TabInfo info = mTabs.get(position); + return Fragment.instantiate(mContext, info.clss.getName(), info.args); + } + + @Override + public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + } + + @Override + public void onPageSelected(int position) { + mActionBar.setSelectedNavigationItem(position); + } + + @Override + public void onPageScrollStateChanged(int state) { + } + + @Override + public void onTabSelected(android.app.ActionBar.Tab tab, + FragmentTransaction ft) { + Object tag = tab.getTag(); + for (int i=0; i<mTabs.size(); i++) { + if (mTabs.get(i) == tag) { + mViewPager.setCurrentItem(i); + } + } + } + + @Override + public void onTabUnselected(android.app.ActionBar.Tab tab, + FragmentTransaction ft) { + } + + @Override + public void onTabReselected(android.app.ActionBar.Tab tab, + FragmentTransaction ft) { + } + } + + private static String makeFragmentName(int viewId, int index) { + return "android:switcher:" + viewId + ":" + index; + } + } |