Revert "use ParcelableCompat so that we are able to receive class loa…

…der" This reverts commit 55096d3.
emilsjolander · Jun 27, 2017 · d2055d1 · d2055d1
1 parent 55096d3
commit d2055d1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/library/build.gradle b/library/build.gradle
@@ -11,9 +11,6 @@ android {
             res.srcDirs = ['res']
         }
     }
-    dependencies {
-        compile "com.android.support:support-v4:22.0.0"
-    }
 }
 
 apply from: 'gradle-mvn-push.gradle'
diff --git a/library/src/se/emilsjolander/stickylistheaders/StickyListHeadersListView.java b/library/src/se/emilsjolander/stickylistheaders/StickyListHeadersListView.java
@@ -10,8 +10,6 @@
 import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.v4.os.ParcelableCompat;
-import android.support.v4.os.ParcelableCompatCreatorCallbacks;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.SparseBooleanArray;
@@ -27,6 +25,7 @@
 import android.widget.FrameLayout;
 import android.widget.ListView;
 import android.widget.SectionIndexer;
+
 import se.emilsjolander.stickylistheaders.WrapperViewList.LifeCycleListener;
 
 /**
@@ -1169,9 +1168,9 @@ static class SavedState extends BaseSavedState {
         /**
          * Constructor called from {@link #CREATOR}
          */
-        private SavedState(Parcel in, final ClassLoader loader) {
+        private SavedState(Parcel in) {
             super(in);
-            wrappedState = in.readParcelable(loader);
+            wrappedState = in.readParcelable(null);
         }
 
         @Override
@@ -1180,16 +1179,15 @@ public void writeToParcel(Parcel out, int flags) {
             out.writeValue(wrappedState);
         }
 
-        public static final 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 Parcelable.Creator<SavedState> CREATOR
+            = new Parcelable.Creator<SavedState>() {
+            public SavedState createFromParcel(Parcel in) {
+                return new SavedState(in);
+            }
+
+            public SavedState[] newArray(int size) {
+                return new SavedState[size];
+            }
+        };
     }
 }