[Android] Upgrade Appcompat to 24.1.1
Geoffrey Métais
git at videolan.org
Tue Jul 26 10:58:01 CEST 2016
vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Tue Jul 26 10:20:26 2016 +0200| [88afca90d9041e5245bd014395eabb60ccbf47e9] | committer: Geoffrey Métais
Upgrade Appcompat to 24.1.1
> https://code.videolan.org/videolan/vlc-android/commit/88afca90d9041e5245bd014395eabb60ccbf47e9
---
build.gradle | 4 +-
vlc-android/build.gradle | 18 ++--
.../com/android/support/v4/view/AbsSavedState.java | 100 ---------------------
3 files changed, 11 insertions(+), 111 deletions(-)
diff --git a/build.gradle b/build.gradle
index 18af319..664a094 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,6 +18,6 @@ allprojects {
}
ext {
- buildToolsVersion = "23.0.3"
- compileSdkVersion = 23
+ buildToolsVersion = "24.0.1"
+ compileSdkVersion = 24
}
diff --git a/vlc-android/build.gradle b/vlc-android/build.gradle
index c4bdbf7..30d3e8d 100644
--- a/vlc-android/build.gradle
+++ b/vlc-android/build.gradle
@@ -224,15 +224,15 @@ dependencies {
compile project(':libvlc')
compile project(':api')
compile project(':axmlrpc')
- compile 'com.android.support:appcompat-v7:23.1.1'
- compile 'com.android.support:cardview-v7:23.1.1'
- compile 'com.android.support:recyclerview-v7:23.1.1'
- compile 'com.android.support:design:23.1.1'
- compile 'com.android.support:support-annotations:23.1.1'
- compile 'com.android.support:preference-v7:23.1.1'
- compile 'com.android.support:percent:23.1.1'
- compile 'com.android.support:leanback-v17:23.1.1'
- compile 'com.android.support:preference-leanback-v17:23.1.1'
+ compile 'com.android.support:appcompat-v7:24.1.1'
+ compile 'com.android.support:cardview-v7:24.1.1'
+ compile 'com.android.support:recyclerview-v7:24.1.1'
+ compile 'com.android.support:design:24.1.1'
+ compile 'com.android.support:support-annotations:24.1.1'
+ compile 'com.android.support:preference-v7:24.1.1'
+ compile 'com.android.support:percent:24.1.1'
+ compile 'com.android.support:leanback-v17:24.1.1'
+ compile 'com.android.support:preference-leanback-v17:24.1.1'
testCompile 'junit:junit:4.12'
}
diff --git a/vlc-android/src/com/android/support/v4/view/AbsSavedState.java b/vlc-android/src/com/android/support/v4/view/AbsSavedState.java
deleted file mode 100644
index e5aba09..0000000
--- a/vlc-android/src/com/android/support/v4/view/AbsSavedState.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2016 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.view;
-
-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
- * hierarchies to ensure the state of all classes along the chain is saved.
- */
-public abstract class AbsSavedState implements Parcelable {
- public static final AbsSavedState EMPTY_STATE = new AbsSavedState() {};
-
- private final Parcelable mSuperState;
-
- /**
- * Constructor used to make the EMPTY_STATE singleton
- */
- private AbsSavedState() {
- mSuperState = null;
- }
-
- /**
- * Constructor called by derived classes when creating their SavedState objects
- *
- * @param superState The state of the superclass of this view
- */
- protected AbsSavedState(Parcelable superState) {
- if (superState == null) {
- throw new IllegalArgumentException("superState must not be null");
- }
- mSuperState = superState != EMPTY_STATE ? superState : null;
- }
-
- /**
- * Constructor used when reading from a parcel. Reads the state of the superclass.
- *
- * @param source parcel to read from
- */
- protected AbsSavedState(Parcel source) {
- this(source, null);
- }
-
- /**
- * Constructor used when reading from a parcel. Reads the state of the superclass.
- *
- * @param source parcel to read from
- * @param loader ClassLoader to use for reading
- */
- protected AbsSavedState(Parcel source, ClassLoader loader) {
- Parcelable superState = source.readParcelable(loader);
- mSuperState = superState != null ? superState : EMPTY_STATE;
- }
-
- final public Parcelable getSuperState() {
- return mSuperState;
- }
-
- public int describeContents() {
- return 0;
- }
-
- public void writeToParcel(Parcel dest, int flags) {
- 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;
- }
-
- @Override
- public AbsSavedState[] newArray(int size) {
- return new AbsSavedState[size];
- }
- });
-}
More information about the Android
mailing list