Clean up ParcelableCompat after minSdk 14 bump.
Bug: 32794064
Test: ./gradlew assemble
Change-Id: I87d35d527e80d55ac4a2a626a6040fcdaff63ae3
diff --git a/api/current.txt b/api/current.txt
index f9acafb..182dfc2 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -6899,11 +6899,11 @@
ctor public OperationCanceledException(java.lang.String);
}
- public final class ParcelableCompat {
- method public static <T> android.os.Parcelable.Creator<T> newCreator(android.support.v4.os.ParcelableCompatCreatorCallbacks<T>);
+ public final deprecated class ParcelableCompat {
+ method public static deprecated <T> android.os.Parcelable.Creator<T> newCreator(android.support.v4.os.ParcelableCompatCreatorCallbacks<T>);
}
- public abstract interface ParcelableCompatCreatorCallbacks<T> {
+ public abstract deprecated interface ParcelableCompatCreatorCallbacks<T> {
method public abstract T createFromParcel(android.os.Parcel, java.lang.ClassLoader);
method public abstract T[] newArray(int);
}
diff --git a/compat/Android.mk b/compat/Android.mk
index 56a197a..f3f7ef3 100644
--- a/compat/Android.mk
+++ b/compat/Android.mk
@@ -27,7 +27,6 @@
LOCAL_SDK_VERSION := $(SUPPORT_CURRENT_SDK_VERSION)
LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/java
LOCAL_SRC_FILES := \
- $(call all-java-files-under,honeycomb_mr2) \
$(call all-java-files-under,ics) \
$(call all-java-files-under,ics-mr1) \
$(call all-java-files-under,jellybean) \
diff --git a/compat/build.gradle b/compat/build.gradle
index 0bc9137..dbaac46 100644
--- a/compat/build.gradle
+++ b/compat/build.gradle
@@ -22,10 +22,6 @@
sourceSets {
main.java.srcDirs = [
- 'gingerbread',
- 'honeycomb',
- 'honeycomb_mr1',
- 'honeycomb_mr2',
'ics',
'ics-mr1',
'jellybean',
diff --git a/compat/honeycomb_mr2/android/support/v4/os/ParcelableCompatHoneycombMR2.java b/compat/honeycomb_mr2/android/support/v4/os/ParcelableCompatHoneycombMR2.java
deleted file mode 100644
index 4accbca..0000000
--- a/compat/honeycomb_mr2/android/support/v4/os/ParcelableCompatHoneycombMR2.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.support.v4.os;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.support.annotation.RequiresApi;
-
-@RequiresApi(13)
-class ParcelableCompatCreatorHoneycombMR2Stub {
- static <T> Parcelable.Creator<T> instantiate(ParcelableCompatCreatorCallbacks<T> callbacks) {
- return new ParcelableCompatCreatorHoneycombMR2<T>(callbacks);
- }
-}
-
-@RequiresApi(13)
-class ParcelableCompatCreatorHoneycombMR2<T> implements Parcelable.ClassLoaderCreator<T> {
- private final ParcelableCompatCreatorCallbacks<T> mCallbacks;
-
- public ParcelableCompatCreatorHoneycombMR2(ParcelableCompatCreatorCallbacks<T> callbacks) {
- mCallbacks = callbacks;
- }
-
- public T createFromParcel(Parcel in) {
- return mCallbacks.createFromParcel(in, null);
- }
-
- public T createFromParcel(Parcel in, ClassLoader loader) {
- return mCallbacks.createFromParcel(in, loader);
- }
-
- public T[] newArray(int size) {
- return mCallbacks.newArray(size);
- }
-}
diff --git a/compat/java/android/support/v4/os/ParcelableCompat.java b/compat/java/android/support/v4/os/ParcelableCompat.java
index 10c03b5..03051a2 100644
--- a/compat/java/android/support/v4/os/ParcelableCompat.java
+++ b/compat/java/android/support/v4/os/ParcelableCompat.java
@@ -20,9 +20,11 @@
import android.os.Parcelable;
/**
- * Helper for accessing features in {@link android.os.Parcelable}
- * introduced after API level 4 in a backwards compatible fashion.
+ * Helper for accessing features in {@link android.os.Parcelable} in a backwards compatible fashion.
+ *
+ * @deprecated Use {@link android.os.Parcelable.ClassLoaderCreator} directly.
*/
+@Deprecated
public final class ParcelableCompat {
/**
@@ -30,28 +32,31 @@
*
* @param callbacks Creator callbacks implementation.
* @return New creator.
+ *
+ * @deprecated Use {@link android.os.Parcelable.ClassLoaderCreator} directly.
*/
+ @Deprecated
public static <T> Parcelable.Creator<T> newCreator(
ParcelableCompatCreatorCallbacks<T> callbacks) {
- if (android.os.Build.VERSION.SDK_INT >= 13) {
- return ParcelableCompatCreatorHoneycombMR2Stub.instantiate(callbacks);
- }
- return new CompatCreator<T>(callbacks);
+ return new ParcelableCompatCreatorHoneycombMR2<T>(callbacks);
}
- static class CompatCreator<T> implements Parcelable.Creator<T> {
- final ParcelableCompatCreatorCallbacks<T> mCallbacks;
+ static class ParcelableCompatCreatorHoneycombMR2<T>
+ implements Parcelable.ClassLoaderCreator<T> {
+ private final ParcelableCompatCreatorCallbacks<T> mCallbacks;
- public CompatCreator(ParcelableCompatCreatorCallbacks<T> callbacks) {
+ ParcelableCompatCreatorHoneycombMR2(ParcelableCompatCreatorCallbacks<T> callbacks) {
mCallbacks = callbacks;
}
- @Override
- public T createFromParcel(Parcel source) {
- return mCallbacks.createFromParcel(source, null);
+ public T createFromParcel(Parcel in) {
+ return mCallbacks.createFromParcel(in, null);
}
- @Override
+ public T createFromParcel(Parcel in, ClassLoader loader) {
+ return mCallbacks.createFromParcel(in, loader);
+ }
+
public T[] newArray(int size) {
return mCallbacks.newArray(size);
}
diff --git a/compat/honeycomb_mr2/android/support/v4/os/ParcelableCompatCreatorCallbacks.java b/compat/java/android/support/v4/os/ParcelableCompatCreatorCallbacks.java
similarity index 89%
rename from compat/honeycomb_mr2/android/support/v4/os/ParcelableCompatCreatorCallbacks.java
rename to compat/java/android/support/v4/os/ParcelableCompatCreatorCallbacks.java
index a577d6f..e5e8a3a 100644
--- a/compat/honeycomb_mr2/android/support/v4/os/ParcelableCompatCreatorCallbacks.java
+++ b/compat/java/android/support/v4/os/ParcelableCompatCreatorCallbacks.java
@@ -21,7 +21,10 @@
/**
* Callbacks a {@link Parcelable} creator should implement.
+ *
+ * @deprecated Use {@link android.os.Parcelable.ClassLoaderCreator} directly.
*/
+@Deprecated
public interface ParcelableCompatCreatorCallbacks<T> {
/**
@@ -34,7 +37,7 @@
* @param loader The ClassLoader that this object is being created in.
* @return Returns a new instance of the Parcelable class.
*/
- public T createFromParcel(Parcel in, ClassLoader loader);
+ T createFromParcel(Parcel in, ClassLoader loader);
/**
* Create a new array of the Parcelable class.
@@ -43,5 +46,5 @@
* @return Returns an array of the Parcelable class, with every entry
* initialized to null.
*/
- public T[] newArray(int size);
+ T[] newArray(int size);
}
diff --git a/core-ui/java/android/support/v4/view/AbsSavedState.java b/core-ui/java/android/support/v4/view/AbsSavedState.java
index 02e89b6..4cf38ac 100644
--- a/core-ui/java/android/support/v4/view/AbsSavedState.java
+++ b/core-ui/java/android/support/v4/view/AbsSavedState.java
@@ -18,8 +18,6 @@
import android.os.Parcel;
import android.os.Parcelable;
-import android.support.v4.os.ParcelableCompat;
-import android.support.v4.os.ParcelableCompatCreatorCallbacks;
/**
* A {@link Parcelable} implementation that should be used by inheritance
@@ -83,20 +81,24 @@
dest.writeParcelable(mSuperState, flags);
}
- public static final Parcelable.Creator<AbsSavedState> CREATOR = ParcelableCompat.newCreator(
- new ParcelableCompatCreatorCallbacks<AbsSavedState>() {
- @Override
- public AbsSavedState createFromParcel(Parcel in, ClassLoader loader) {
- Parcelable superState = in.readParcelable(loader);
- if (superState != null) {
- throw new IllegalStateException("superState must be null");
- }
- return EMPTY_STATE;
- }
+ public static final Creator<AbsSavedState> CREATOR = new ClassLoaderCreator<AbsSavedState>() {
+ @Override
+ public AbsSavedState createFromParcel(Parcel in, ClassLoader loader) {
+ Parcelable superState = in.readParcelable(loader);
+ if (superState != null) {
+ throw new IllegalStateException("superState must be null");
+ }
+ return EMPTY_STATE;
+ }
- @Override
- public AbsSavedState[] newArray(int size) {
- return new AbsSavedState[size];
- }
- });
+ @Override
+ public AbsSavedState createFromParcel(Parcel in) {
+ return createFromParcel(in, null);
+ }
+
+ @Override
+ public AbsSavedState[] newArray(int size) {
+ return new AbsSavedState[size];
+ }
+ };
}
diff --git a/core-ui/java/android/support/v4/view/ViewPager.java b/core-ui/java/android/support/v4/view/ViewPager.java
index 7ac7106..4c1e497 100644
--- a/core-ui/java/android/support/v4/view/ViewPager.java
+++ b/core-ui/java/android/support/v4/view/ViewPager.java
@@ -32,8 +32,6 @@
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
-import android.support.v4.os.ParcelableCompat;
-import android.support.v4.os.ParcelableCompatCreatorCallbacks;
import android.support.v4.view.accessibility.AccessibilityEventCompat;
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
import android.support.v4.view.accessibility.AccessibilityRecordCompat;
@@ -1404,17 +1402,21 @@
+ " position=" + position + "}";
}
- public static final Parcelable.Creator<SavedState> CREATOR = ParcelableCompat.newCreator(
- new ParcelableCompatCreatorCallbacks<SavedState>() {
- @Override
- public SavedState createFromParcel(Parcel in, ClassLoader loader) {
- return new SavedState(in, loader);
- }
- @Override
- public SavedState[] newArray(int size) {
- return new SavedState[size];
- }
- });
+ 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, null);
+ }
+ @Override
+ public SavedState[] newArray(int size) {
+ return new SavedState[size];
+ }
+ };
SavedState(Parcel in, ClassLoader loader) {
super(in, loader);
diff --git a/core-ui/java/android/support/v4/widget/DrawerLayout.java b/core-ui/java/android/support/v4/widget/DrawerLayout.java
index eb5a446..74c6bf4 100644
--- a/core-ui/java/android/support/v4/widget/DrawerLayout.java
+++ b/core-ui/java/android/support/v4/widget/DrawerLayout.java
@@ -36,8 +36,6 @@
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v4.os.ParcelableCompat;
-import android.support.v4.os.ParcelableCompatCreatorCallbacks;
import android.support.v4.view.AbsSavedState;
import android.support.v4.view.AccessibilityDelegateCompat;
import android.support.v4.view.GravityCompat;
@@ -2035,18 +2033,22 @@
dest.writeInt(lockModeEnd);
}
- public static final Creator<SavedState> CREATOR = ParcelableCompat.newCreator(
- new ParcelableCompatCreatorCallbacks<SavedState>() {
- @Override
- public SavedState createFromParcel(Parcel in, ClassLoader loader) {
- return new SavedState(in, loader);
- }
+ 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[] newArray(int size) {
- return new SavedState[size];
- }
- });
+ @Override
+ public SavedState createFromParcel(Parcel in) {
+ return new SavedState(in, null);
+ }
+
+ @Override
+ public SavedState[] newArray(int size) {
+ return new SavedState[size];
+ }
+ };
}
private class ViewDragCallback extends ViewDragHelper.Callback {
diff --git a/core-ui/java/android/support/v4/widget/SlidingPaneLayout.java b/core-ui/java/android/support/v4/widget/SlidingPaneLayout.java
index 9fe60cf..82b974c 100644
--- a/core-ui/java/android/support/v4/widget/SlidingPaneLayout.java
+++ b/core-ui/java/android/support/v4/widget/SlidingPaneLayout.java
@@ -32,8 +32,6 @@
import android.support.annotation.ColorInt;
import android.support.annotation.DrawableRes;
import android.support.v4.content.ContextCompat;
-import android.support.v4.os.ParcelableCompat;
-import android.support.v4.os.ParcelableCompatCreatorCallbacks;
import android.support.v4.view.AbsSavedState;
import android.support.v4.view.AccessibilityDelegateCompat;
import android.support.v4.view.ViewCompat;
@@ -1479,18 +1477,22 @@
out.writeInt(isOpen ? 1 : 0);
}
- public static final Creator<SavedState> CREATOR = ParcelableCompat.newCreator(
- new ParcelableCompatCreatorCallbacks<SavedState>() {
- @Override
- public SavedState createFromParcel(Parcel in, ClassLoader loader) {
- return new SavedState(in, loader);
- }
+ public static final Creator<SavedState> CREATOR = new ClassLoaderCreator<SavedState>() {
+ @Override
+ public SavedState createFromParcel(Parcel in, ClassLoader loader) {
+ return new SavedState(in, null);
+ }
- @Override
- public SavedState[] newArray(int size) {
- return new SavedState[size];
- }
- });
+ @Override
+ public SavedState createFromParcel(Parcel in) {
+ return new SavedState(in, null);
+ }
+
+ @Override
+ public SavedState[] newArray(int size) {
+ return new SavedState[size];
+ }
+ };
}
interface SlidingPanelLayoutImpl {
diff --git a/design/src/android/support/design/internal/ParcelableSparseArray.java b/design/src/android/support/design/internal/ParcelableSparseArray.java
index 746ba00..b29000e 100644
--- a/design/src/android/support/design/internal/ParcelableSparseArray.java
+++ b/design/src/android/support/design/internal/ParcelableSparseArray.java
@@ -21,8 +21,6 @@
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.RestrictTo;
-import android.support.v4.os.ParcelableCompat;
-import android.support.v4.os.ParcelableCompatCreatorCallbacks;
import android.util.SparseArray;
/**
@@ -65,18 +63,21 @@
parcel.writeParcelableArray(values, flags);
}
- public static final Parcelable.Creator<ParcelableSparseArray> CREATOR =
- ParcelableCompat
- .newCreator(new ParcelableCompatCreatorCallbacks<ParcelableSparseArray>() {
- @Override
- public ParcelableSparseArray createFromParcel(Parcel source,
- ClassLoader loader) {
- return new ParcelableSparseArray(source, loader);
- }
+ public static final Creator<ParcelableSparseArray> CREATOR =
+ new ClassLoaderCreator<ParcelableSparseArray>() {
+ @Override
+ public ParcelableSparseArray createFromParcel(Parcel source, ClassLoader loader) {
+ return new ParcelableSparseArray(source, loader);
+ }
- @Override
- public ParcelableSparseArray[] newArray(int size) {
- return new ParcelableSparseArray[size];
- }
- });
+ @Override
+ public ParcelableSparseArray createFromParcel(Parcel source) {
+ return new ParcelableSparseArray(source, null);
+ }
+
+ @Override
+ public ParcelableSparseArray[] newArray(int size) {
+ return new ParcelableSparseArray[size];
+ }
+ };
}
diff --git a/design/src/android/support/design/widget/AppBarLayout.java b/design/src/android/support/design/widget/AppBarLayout.java
index e350cd4..50e6c7e 100644
--- a/design/src/android/support/design/widget/AppBarLayout.java
+++ b/design/src/android/support/design/widget/AppBarLayout.java
@@ -33,8 +33,6 @@
import android.support.annotation.RestrictTo;
import android.support.annotation.VisibleForTesting;
import android.support.design.R;
-import android.support.v4.os.ParcelableCompat;
-import android.support.v4.os.ParcelableCompatCreatorCallbacks;
import android.support.v4.view.AbsSavedState;
import android.support.v4.view.ViewCompat;
import android.support.v4.view.WindowInsetsCompat;
@@ -1367,18 +1365,22 @@
dest.writeByte((byte) (firstVisibleChildAtMinimumHeight ? 1 : 0));
}
- public static final Parcelable.Creator<SavedState> CREATOR =
- ParcelableCompat.newCreator(new ParcelableCompatCreatorCallbacks<SavedState>() {
- @Override
- public SavedState createFromParcel(Parcel source, ClassLoader loader) {
- return new SavedState(source, loader);
- }
+ public static final Creator<SavedState> CREATOR = new ClassLoaderCreator<SavedState>() {
+ @Override
+ public SavedState createFromParcel(Parcel source, ClassLoader loader) {
+ return new SavedState(source, loader);
+ }
- @Override
- public SavedState[] newArray(int size) {
- return new SavedState[size];
- }
- });
+ @Override
+ public SavedState createFromParcel(Parcel source) {
+ return new SavedState(source, null);
+ }
+
+ @Override
+ public SavedState[] newArray(int size) {
+ return new SavedState[size];
+ }
+ };
}
}
diff --git a/design/src/android/support/design/widget/BottomNavigationView.java b/design/src/android/support/design/widget/BottomNavigationView.java
index 01ed8de..61dba87 100644
--- a/design/src/android/support/design/widget/BottomNavigationView.java
+++ b/design/src/android/support/design/widget/BottomNavigationView.java
@@ -31,8 +31,6 @@
import android.support.design.internal.BottomNavigationMenuView;
import android.support.design.internal.BottomNavigationPresenter;
import android.support.v4.content.ContextCompat;
-import android.support.v4.os.ParcelableCompat;
-import android.support.v4.os.ParcelableCompatCreatorCallbacks;
import android.support.v4.view.AbsSavedState;
import android.support.v4.view.ViewCompat;
import android.support.v7.content.res.AppCompatResources;
@@ -459,17 +457,21 @@
menuPresenterState = in.readBundle(loader);
}
- public static final Creator<SavedState> CREATOR =
- ParcelableCompat.newCreator(new ParcelableCompatCreatorCallbacks<SavedState>() {
- @Override
- public SavedState createFromParcel(Parcel in, ClassLoader loader) {
- return new SavedState(in, loader);
- }
+ 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[] newArray(int size) {
- return new SavedState[size];
- }
- });
+ @Override
+ public SavedState createFromParcel(Parcel in) {
+ return new SavedState(in, null);
+ }
+
+ @Override
+ public SavedState[] newArray(int size) {
+ return new SavedState[size];
+ }
+ };
}
}
diff --git a/design/src/android/support/design/widget/BottomSheetBehavior.java b/design/src/android/support/design/widget/BottomSheetBehavior.java
index 448a4b0..6d664b5 100644
--- a/design/src/android/support/design/widget/BottomSheetBehavior.java
+++ b/design/src/android/support/design/widget/BottomSheetBehavior.java
@@ -27,8 +27,6 @@
import android.support.annotation.RestrictTo;
import android.support.annotation.VisibleForTesting;
import android.support.design.R;
-import android.support.v4.os.ParcelableCompat;
-import android.support.v4.os.ParcelableCompatCreatorCallbacks;
import android.support.v4.view.AbsSavedState;
import android.support.v4.view.ViewCompat;
import android.support.v4.widget.ViewDragHelper;
@@ -785,18 +783,22 @@
out.writeInt(state);
}
- public static final Creator<SavedState> CREATOR = ParcelableCompat.newCreator(
- new ParcelableCompatCreatorCallbacks<SavedState>() {
- @Override
- public SavedState createFromParcel(Parcel in, ClassLoader loader) {
- return new SavedState(in, loader);
- }
+ 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[] newArray(int size) {
- return new SavedState[size];
- }
- });
+ @Override
+ public SavedState createFromParcel(Parcel in) {
+ return new SavedState(in, null);
+ }
+
+ @Override
+ public SavedState[] newArray(int size) {
+ return new SavedState[size];
+ }
+ };
}
/**
diff --git a/design/src/android/support/design/widget/CoordinatorLayout.java b/design/src/android/support/design/widget/CoordinatorLayout.java
index 8a2c4f2..6fd2a93 100644
--- a/design/src/android/support/design/widget/CoordinatorLayout.java
+++ b/design/src/android/support/design/widget/CoordinatorLayout.java
@@ -45,8 +45,6 @@
import android.support.design.R;
import android.support.v4.content.ContextCompat;
import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v4.os.ParcelableCompat;
-import android.support.v4.os.ParcelableCompatCreatorCallbacks;
import android.support.v4.util.Pools;
import android.support.v4.view.AbsSavedState;
import android.support.v4.view.GravityCompat;
@@ -3097,17 +3095,22 @@
}
- public static final Parcelable.Creator<SavedState> CREATOR
- = ParcelableCompat.newCreator(new ParcelableCompatCreatorCallbacks<SavedState>() {
- @Override
- public SavedState createFromParcel(Parcel in, ClassLoader loader) {
- return new SavedState(in, loader);
- }
+ public static final Parcelable.Creator<SavedState> CREATOR =
+ new ClassLoaderCreator<SavedState>() {
+ @Override
+ public SavedState createFromParcel(Parcel in, ClassLoader loader) {
+ return new SavedState(in, loader);
+ }
- @Override
- public SavedState[] newArray(int size) {
- return new SavedState[size];
- }
- });
+ @Override
+ public SavedState createFromParcel(Parcel in) {
+ return new SavedState(in, null);
+ }
+
+ @Override
+ public SavedState[] newArray(int size) {
+ return new SavedState[size];
+ }
+ };
}
}
diff --git a/design/src/android/support/design/widget/NavigationView.java b/design/src/android/support/design/widget/NavigationView.java
index 044f096..8fc8c76 100644
--- a/design/src/android/support/design/widget/NavigationView.java
+++ b/design/src/android/support/design/widget/NavigationView.java
@@ -36,8 +36,6 @@
import android.support.design.internal.NavigationMenuPresenter;
import android.support.design.internal.ScrimInsetsFrameLayout;
import android.support.v4.content.ContextCompat;
-import android.support.v4.os.ParcelableCompat;
-import android.support.v4.os.ParcelableCompatCreatorCallbacks;
import android.support.v4.view.AbsSavedState;
import android.support.v4.view.ViewCompat;
import android.support.v4.view.WindowInsetsCompat;
@@ -475,18 +473,22 @@
dest.writeBundle(menuState);
}
- public static final Parcelable.Creator<SavedState> CREATOR
- = ParcelableCompat.newCreator(new ParcelableCompatCreatorCallbacks<SavedState>() {
+ public static final Creator<SavedState> CREATOR = new ClassLoaderCreator<SavedState>() {
@Override
- public SavedState createFromParcel(Parcel parcel, ClassLoader loader) {
- return new SavedState(parcel, loader);
+ public SavedState createFromParcel(Parcel in, ClassLoader loader) {
+ return new SavedState(in, loader);
+ }
+
+ @Override
+ public SavedState createFromParcel(Parcel in) {
+ return new SavedState(in, null);
}
@Override
public SavedState[] newArray(int size) {
return new SavedState[size];
}
- });
+ };
}
}
diff --git a/design/src/android/support/design/widget/TextInputLayout.java b/design/src/android/support/design/widget/TextInputLayout.java
index 83e517d..9774027 100644
--- a/design/src/android/support/design/widget/TextInputLayout.java
+++ b/design/src/android/support/design/widget/TextInputLayout.java
@@ -42,8 +42,6 @@
import android.support.design.R;
import android.support.v4.content.ContextCompat;
import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v4.os.ParcelableCompat;
-import android.support.v4.os.ParcelableCompatCreatorCallbacks;
import android.support.v4.view.AbsSavedState;
import android.support.v4.view.AccessibilityDelegateCompat;
import android.support.v4.view.GravityCompat;
@@ -964,18 +962,22 @@
+ " error=" + error + "}";
}
- public static final Creator<SavedState> CREATOR = ParcelableCompat.newCreator(
- new ParcelableCompatCreatorCallbacks<SavedState>() {
- @Override
- public SavedState createFromParcel(Parcel in, ClassLoader loader) {
- return new SavedState(in, loader);
- }
+ 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[] newArray(int size) {
- return new SavedState[size];
- }
- });
+ @Override
+ public SavedState createFromParcel(Parcel in) {
+ return new SavedState(in, null);
+ }
+
+ @Override
+ public SavedState[] newArray(int size) {
+ return new SavedState[size];
+ }
+ };
}
@Override
diff --git a/v7/appcompat/src/android/support/v7/app/AppCompatDelegateImplV9.java b/v7/appcompat/src/android/support/v7/app/AppCompatDelegateImplV9.java
index 64aa23b..a330ece 100644
--- a/v7/appcompat/src/android/support/v7/app/AppCompatDelegateImplV9.java
+++ b/v7/appcompat/src/android/support/v7/app/AppCompatDelegateImplV9.java
@@ -38,8 +38,6 @@
import android.support.annotation.Nullable;
import android.support.annotation.RequiresApi;
import android.support.v4.app.NavUtils;
-import android.support.v4.os.ParcelableCompat;
-import android.support.v4.os.ParcelableCompatCreatorCallbacks;
import android.support.v4.view.LayoutInflaterCompat;
import android.support.v4.view.OnApplyWindowInsetsListener;
import android.support.v4.view.ViewCompat;
@@ -2100,19 +2098,22 @@
return savedState;
}
- public static final Parcelable.Creator<SavedState> CREATOR
- = ParcelableCompat.newCreator(
- new ParcelableCompatCreatorCallbacks<SavedState>() {
- @Override
- public SavedState createFromParcel(Parcel in, ClassLoader loader) {
- return readFromParcel(in, loader);
- }
+ public static final Creator<SavedState> CREATOR = new ClassLoaderCreator<SavedState>() {
+ @Override
+ public SavedState createFromParcel(Parcel in, ClassLoader loader) {
+ return readFromParcel(in, loader);
+ }
- @Override
- public SavedState[] newArray(int size) {
- return new SavedState[size];
- }
- });
+ @Override
+ public SavedState createFromParcel(Parcel in) {
+ return readFromParcel(in, null);
+ }
+
+ @Override
+ public SavedState[] newArray(int size) {
+ return new SavedState[size];
+ }
+ };
}
}
diff --git a/v7/appcompat/src/android/support/v7/widget/SearchView.java b/v7/appcompat/src/android/support/v7/widget/SearchView.java
index ef7c65f..2dac3d9 100644
--- a/v7/appcompat/src/android/support/v7/widget/SearchView.java
+++ b/v7/appcompat/src/android/support/v7/widget/SearchView.java
@@ -42,8 +42,6 @@
import android.speech.RecognizerIntent;
import android.support.annotation.Nullable;
import android.support.annotation.RestrictTo;
-import android.support.v4.os.ParcelableCompat;
-import android.support.v4.os.ParcelableCompatCreatorCallbacks;
import android.support.v4.view.AbsSavedState;
import android.support.v4.view.ViewCompat;
import android.support.v4.widget.CursorAdapter;
@@ -1372,18 +1370,22 @@
+ " isIconified=" + isIconified + "}";
}
- public static final Parcelable.Creator<SavedState> CREATOR = ParcelableCompat.newCreator(
- new ParcelableCompatCreatorCallbacks<SavedState>() {
- @Override
- public SavedState createFromParcel(Parcel in, ClassLoader loader) {
- return new SavedState(in, loader);
- }
+ 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[] newArray(int size) {
- return new SavedState[size];
- }
- });
+ @Override
+ public SavedState createFromParcel(Parcel in) {
+ return new SavedState(in, null);
+ }
+
+ @Override
+ public SavedState[] newArray(int size) {
+ return new SavedState[size];
+ }
+ };
}
@Override
diff --git a/v7/appcompat/src/android/support/v7/widget/Toolbar.java b/v7/appcompat/src/android/support/v7/widget/Toolbar.java
index 3cf2c88..277c1cb 100644
--- a/v7/appcompat/src/android/support/v7/widget/Toolbar.java
+++ b/v7/appcompat/src/android/support/v7/widget/Toolbar.java
@@ -31,8 +31,6 @@
import android.support.annotation.RestrictTo;
import android.support.annotation.StringRes;
import android.support.annotation.StyleRes;
-import android.support.v4.os.ParcelableCompat;
-import android.support.v4.os.ParcelableCompatCreatorCallbacks;
import android.support.v4.view.AbsSavedState;
import android.support.v4.view.GravityCompat;
import android.support.v4.view.MarginLayoutParamsCompat;
@@ -2272,18 +2270,22 @@
out.writeInt(isOverflowOpen ? 1 : 0);
}
- public static final Creator<SavedState> CREATOR = ParcelableCompat.newCreator(
- new ParcelableCompatCreatorCallbacks<SavedState>() {
- @Override
- public SavedState createFromParcel(Parcel in, ClassLoader loader) {
- return new SavedState(in, loader);
- }
+ 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[] newArray(int size) {
- return new SavedState[size];
- }
- });
+ @Override
+ public SavedState createFromParcel(Parcel in) {
+ return new SavedState(in, null);
+ }
+
+ @Override
+ public SavedState[] newArray(int size) {
+ return new SavedState[size];
+ }
+ };
}
private class ExpandedActionViewMenuPresenter implements MenuPresenter {
diff --git a/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java b/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java
index 3343a21..2725bf0 100644
--- a/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java
+++ b/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java
@@ -41,8 +41,6 @@
import android.support.annotation.Nullable;
import android.support.annotation.RestrictTo;
import android.support.annotation.VisibleForTesting;
-import android.support.v4.os.ParcelableCompat;
-import android.support.v4.os.ParcelableCompatCreatorCallbacks;
import android.support.v4.os.TraceCompat;
import android.support.v4.view.AbsSavedState;
import android.support.v4.view.InputDeviceCompat;
@@ -11466,7 +11464,7 @@
}
/**
- * This is public so that the CREATOR can be access on cold launch.
+ * This is public so that the CREATOR can be accessed on cold launch.
* @hide
*/
@RestrictTo(LIBRARY_GROUP)
@@ -11500,18 +11498,22 @@
mLayoutState = other.mLayoutState;
}
- public static final Creator<SavedState> CREATOR = ParcelableCompat.newCreator(
- new ParcelableCompatCreatorCallbacks<SavedState>() {
- @Override
- public SavedState createFromParcel(Parcel in, ClassLoader loader) {
- return new SavedState(in, loader);
- }
+ 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[] newArray(int size) {
- return new SavedState[size];
- }
- });
+ @Override
+ public SavedState createFromParcel(Parcel in) {
+ return new SavedState(in, null);
+ }
+
+ @Override
+ public SavedState[] newArray(int size) {
+ return new SavedState[size];
+ }
+ };
}
/**
* <p>Contains useful information about the current RecyclerView state like target scroll