Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "viewpager_state" into oc-dev

Browse Source 
* changes:
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c am: aebf5c06df am: d04ccc6608 am: b3e984c412
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c am: aebf5c06df am: d04ccc6608
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c am: aebf5c06df
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1
  Update internal ViewPager's SavedState to match Support Library version
This commit is contained in:
Alan Viverette
2018-03-09 18:43:02 +00:00
committed by Android (Google) Code Review
parent 714fb7ae84 705e28e26b
commit 77edd5fabe
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/com/android/internal/widget/ViewPager.java
View File

@@ -31,6 +31,7 @@ import android.os.Parcelable;
import android.util.AttributeSet;
import android.util.Log;
import android.util.MathUtils;
import android.view.AbsSavedState;
import android.view.FocusFinder;
import android.view.Gravity;
import android.view.KeyEvent;
@@ -1198,15 +1199,11 @@ public class ViewPager extends ViewGroup {
* state, in which case it should implement a subclass of this which
* contains that state.
*/
public static class SavedState extends BaseSavedState {
public static class SavedState extends AbsSavedState {
int position;
Parcelable adapterState;
ClassLoader loader;
public SavedState(Parcel source) {
super(source);
}
public SavedState(Parcelable superState) {
super(superState);
}
@@ -1225,10 +1222,15 @@ public class ViewPager extends ViewGroup {
+ " position=" + position + "}";
}
public static final Creator<SavedState> CREATOR = new Creator<SavedState>() {
public static final Creator<SavedState> CREATOR = new ClassLoaderCreator<SavedState>() {
@Override
public SavedState createFromParcel(Parcel in, ClassLoader loader) {
return new SavedState(in, loader);
}
@Override
public SavedState createFromParcel(Parcel in) {
return new SavedState(in);
return new SavedState(in, null);
}
@Override
public SavedState[] newArray(int size) {
@@ -1237,7 +1239,7 @@ public class ViewPager extends ViewGroup {
};
SavedState(Parcel in, ClassLoader loader) {
super(in);
super(in, loader);
if (loader == null) {
loader = getClass().getClassLoader();
}