Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc496378 authored by Bruno Martins's avatar Bruno Martins
Browse files

SetupWizard: Migrate to androidx 

Change-Id: Iade6aeca1338c1e543d09aff83f8cf39d7c78e22
parent 30b301f1

Android.mk

+1 −6
Original line number Diff line number Diff line
@@ -15,12 +15,7 @@ LOCAL_PRIVATE_PLATFORM_APIS := true 
LOCAL_PROGUARD_FLAG_FILES := proguard.flags



LOCAL_STATIC_ANDROID_LIBRARIES := \

    android-support-v4 \

    android-support-v7-appcompat \

    android-support-v7-preference \

    android-support-v7-recyclerview \

    android-support-v13 \

    android-support-v14-preference

    androidx.core_core



LOCAL_STATIC_JAVA_LIBRARIES := \

    libphonenumber \

proguard.flags

+1 −1
Original line number Diff line number Diff line
@@ -9,4 +9,4 @@ 


# Needed when building against the Marshmallow SDK

-dontwarn org.apache.http.**

-dontwarn android.support.**
 
-dontwarn androidx.**

src/org/lineageos/setupwizard/widget/ScrimInsetsFrameLayout.java

+2 −1
Original line number Diff line number Diff line
@@ -21,10 +21,11 @@ import android.content.res.TypedArray; 
import android.graphics.Canvas;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import android.support.v4.view.ViewCompat;

import android.util.AttributeSet;

import android.widget.FrameLayout;



import androidx.core.view.ViewCompat;



import org.lineageos.setupwizard.R;



/**