DO NOT MERGE. Only impacts SDK. Integrate from master.

Update for ViewPager changes

Change-Id: Ib7024ae0ba2759a8477f267438b7b3a35ae51d23

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
@@ -135,6 +135,10 @@ public class ActionBarTabsPager extends Activity {
         }
 
         @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 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) {
+        }
     }
 }