PawletOS/lineageos_setupwizard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SetupWizard: Migrate to androidx

Browse Source 
Change-Id: Iade6aeca1338c1e543d09aff83f8cf39d7c78e22
This commit is contained in:
Bruno Martins
2019-09-11 15:38:38 +01:00
parent 30b301f1fe
commit dc49637898
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Android.mk
View File

@@ -15,12 +15,7 @@ LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_PROGUARD_FLAG_FILES := proguard.flags LOCAL_PROGUARD_FLAG_FILES := proguard.flags
LOCAL_STATIC_ANDROID_LIBRARIES := \ LOCAL_STATIC_ANDROID_LIBRARIES := \
android-support-v4 \ androidx.core_core
android-support-v7-appcompat \
android-support-v7-preference \
android-support-v7-recyclerview \
android-support-v13 \
android-support-v14-preference
LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \
libphonenumber \ libphonenumber \

2
proguard.flags
View File

@@ -9,4 +9,4 @@
# Needed when building against the Marshmallow SDK # Needed when building against the Marshmallow SDK
-dontwarn org.apache.http.** -dontwarn org.apache.http.**
-dontwarn android.support.** -dontwarn androidx.**

3
src/org/lineageos/setupwizard/widget/ScrimInsetsFrameLayout.java
View File

@@ -21,10 +21,11 @@ import android.content.res.TypedArray;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.support.v4.view.ViewCompat;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import androidx.core.view.ViewCompat;
import org.lineageos.setupwizard.R; import org.lineageos.setupwizard.R;
/** /**