diff options
| author | Keith Packard <keithp@keithp.com> | 2013-03-10 11:43:06 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-03-10 11:43:06 -0700 |
| commit | 90ee11542b111befa0e96e27292dc548e5c37396 (patch) | |
| tree | 088785d41e4aa3216489277ff5901c1b04f612e8 /altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java | |
| parent | 97efce5f7ff227aaa8990529217d3d10db3443dc (diff) | |
| parent | d7973de32adff5402844cc1e1da3eced05265074 (diff) | |
Merge remote-tracking branch 'mjb/altosdroid'
Diffstat (limited to 'altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java')
| -rw-r--r-- | altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index 63043abd..c9ce46a0 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -80,7 +80,7 @@ public class AltosDroid extends FragmentActivity { // Tabs TabHost mTabHost; - ViewPager mViewPager; + AltosViewPager mViewPager; TabsAdapter mTabsAdapter; ArrayList<AltosDroidTab> mTabs = new ArrayList<AltosDroidTab>(); @@ -272,7 +272,7 @@ public class AltosDroid extends FragmentActivity { mTabHost = (TabHost)findViewById(android.R.id.tabhost); mTabHost.setup(); - mViewPager = (ViewPager)findViewById(R.id.pager); + mViewPager = (AltosViewPager)findViewById(R.id.pager); mViewPager.setOffscreenPageLimit(4); mTabsAdapter = new TabsAdapter(this, mTabHost, mViewPager); |