منصة شليله
Fork

提交

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

* commit 'b0b4bcfc3148693f26736ca191171380577d04ce':

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

--- 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 {
135	135	}
136	136
137	137	@Override
	138	+ public void onPageScrollStateChanged(int state) {
	139	+ }
	140	+
	141	+ @Override
138	142	public void onTabSelected(Tab tab, FragmentTransaction ft) {
139	143	Object tag = tab.getTag();
140	144	for (int i=0; i<mTabs.size(); i++) {

--- 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 @@
15	15	*/
16	16	package com.example.android.supportv4.app;
17	17
18		-import java.util.ArrayList;
19		-
20	18	import com.example.android.supportv4.R;
21	19
22	20	import android.content.Context;

		@@ -28,6 +26,8 @@ import android.support.v4.view.ViewPager;
28	26	import android.view.View;
29	27	import android.widget.TabHost;
30	28
	29	+import java.util.ArrayList;
	30	+
31	31	/**
32	32	* Demonstrates combining a TabHost with a ViewPager to implement a tab UI
33	33	* that switches between tabs and also allows the user to perform horizontal

		@@ -161,5 +161,9 @@ public class FragmentTabsPager extends FragmentActivity {
161	161	public void onPageSelected(int position) {
162	162	mTabHost.setCurrentTab(position);
163	163	}
	164	+
	165	+ @Override
	166	+ public void onPageScrollStateChanged(int state) {
	167	+ }
164	168	}
165	169	}