From b0b4bcfc3148693f26736ca191171380577d04ce Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Wed, 15 Jun 2011 17:31:12 -0700 Subject: [PATCH] DO NOT MERGE. Only impacts SDK. Integrate from master. Update for ViewPager changes Change-Id: Ib7024ae0ba2759a8477f267438b7b3a35ae51d23 --- .../android/supportv13/app/ActionBarTabsPager.java | 4 ++++ .../example/android/supportv4/app/FragmentTabsPager.java | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) 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 6c0f803de..433f7e948 100644 --- a/samples/Support13Demos/src/com/example/android/supportv13/app/ActionBarTabsPager.java +++ b/samples/Support13Demos/src/com/example/android/supportv13/app/ActionBarTabsPager.java @@ -134,6 +134,10 @@ public class ActionBarTabsPager extends Activity { mActionBar.setSelectedNavigationItem(position); } + @Override + public void onPageScrollStateChanged(int state) { + } + @Override public void onTabSelected(Tab tab, FragmentTransaction ft) { Object tag = tab.getTag(); 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 6db9d3c6e..75498fd23 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.support.v4.view.ViewPager; 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 class FragmentTabsPager extends FragmentActivity { public void onPageSelected(int position) { mTabHost.setCurrentTab(position); } + + @Override + public void onPageScrollStateChanged(int state) { + } } }