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:
@@ -134,6 +134,10 @@ public class ActionBarTabsPager extends Activity {
|
|||||||
mActionBar.setSelectedNavigationItem(position);
|
mActionBar.setSelectedNavigationItem(position);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onPageScrollStateChanged(int state) {
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onTabSelected(Tab tab, FragmentTransaction ft) {
|
public void onTabSelected(Tab tab, FragmentTransaction ft) {
|
||||||
Object tag = tab.getTag();
|
Object tag = tab.getTag();
|
||||||
|
|||||||
@@ -15,8 +15,6 @@
|
|||||||
*/
|
*/
|
||||||
package com.example.android.supportv4.app;
|
package com.example.android.supportv4.app;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
|
|
||||||
import com.example.android.supportv4.R;
|
import com.example.android.supportv4.R;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
@@ -28,6 +26,8 @@ import android.support.v4.view.ViewPager;
|
|||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.TabHost;
|
import android.widget.TabHost;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Demonstrates combining a TabHost with a ViewPager to implement a tab UI
|
* Demonstrates combining a TabHost with a ViewPager to implement a tab UI
|
||||||
* that switches between tabs and also allows the user to perform horizontal
|
* 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) {
|
public void onPageSelected(int position) {
|
||||||
mTabHost.setCurrentTab(position);
|
mTabHost.setCurrentTab(position);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onPageScrollStateChanged(int state) {
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user