am b0b4bcfc: DO NOT MERGE. Only impacts SDK. Integrate from master.

* commit 'b0b4bcfc3148693f26736ca191171380577d04ce':
  DO NOT MERGE.  Only impacts SDK.  Integrate from master.
This commit is contained in:
Adam Powell
2011-06-16 00:49:22 -07:00
committed by Android Git Automerger
2 changed files with 10 additions and 2 deletions

View File

@@ -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();

View File

@@ -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) {
}
}
}