Update internal ViewPager's SavedState to match Support Library version

Merged-In: Ic4569b21d8a26a62bba91742b442f0c3ea8bcc9e
Change-Id: I17d085be9ce1a139e75264f1e715df7f565cd41b
Fixes: 71992105
Test: manual
This commit is contained in:
Alan Viverette
2018-02-16 13:56:02 -05:00
parent e137462b2c
commit 187964aca1

View File

@@ -30,6 +30,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;
@@ -1214,15 +1215,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);
}
@@ -1241,10 +1238,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) {
@@ -1253,7 +1255,7 @@ public class ViewPager extends ViewGroup {
};
SavedState(Parcel in, ClassLoader loader) {
super(in);
super(in, loader);
if (loader == null) {
loader = getClass().getClassLoader();
}