| commit | b0b4bcfc3148693f26736ca191171380577d04ce | [log] [tgz] |
|---|---|---|
| author | Adam Powell <adamp@google.com> | Wed Jun 15 17:31:12 2011 -0700 |
| committer | Dianne Hackborn <hackbod@google.com> | Thu Jun 16 00:42:18 2011 -0700 |
| tree | d5d7d71c2ef4bc36e2cdaf7f847c37b7d5eb05e9 | |
| parent | 47d88948c97657d443fbef5dc1b67f4a1cd5bc12 [diff] |
DO NOT MERGE. Only impacts SDK. Integrate from master. Update for ViewPager changes Change-Id: Ib7024ae0ba2759a8477f267438b7b3a35ae51d23
diff --git a/samples/Support13Demos/src/com/example/android/supportv13/app/ActionBarTabsPager.java b/samples/Support13Demos/src/com/example/android/supportv13/app/ActionBarTabsPager.java index 6c0f803..433f7e9 100644 --- a/samples/Support13Demos/src/com/example/android/supportv13/app/ActionBarTabsPager.java +++ b/samples/Support13Demos/src/com/example/android/supportv13/app/ActionBarTabsPager.java
@@ -135,6 +135,10 @@ } @Override + public void onPageScrollStateChanged(int state) { + } + + @Override public void onTabSelected(Tab tab, FragmentTransaction ft) { Object tag = tab.getTag(); for (int i=0; i<mTabs.size(); i++) {
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentTabsPager.java b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentTabsPager.java index 6db9d3c..75498fd 100644 --- a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentTabsPager.java +++ b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentTabsPager.java
@@ -15,8 +15,6 @@ */ package com.example.android.supportv4.app; -import java.util.ArrayList; - import com.example.android.supportv4.R; import android.content.Context; @@ -28,6 +26,8 @@ import android.view.View; import android.widget.TabHost; +import java.util.ArrayList; + /** * Demonstrates combining a TabHost with a ViewPager to implement a tab UI * that switches between tabs and also allows the user to perform horizontal @@ -161,5 +161,9 @@ public void onPageSelected(int position) { mTabHost.setCurrentTab(position); } + + @Override + public void onPageScrollStateChanged(int state) { + } } }