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

Commit a544f17b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Migrate Settings to androidx."

parents 6e2db2c3 03fcde33

Android.mk

+13 −13
Original line number Diff line number Diff line
@@ -21,17 +21,17 @@ LOCAL_USE_AAPT2 := true 
LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_STATIC_ANDROID_LIBRARIES := \

    android-slices-builders \

    android-slices-core \

    android-slices-view \

    android-support-compat \

    android-support-v4 \

    android-support-v13 \

    android-support-v7-appcompat \

    android-support-v7-cardview \

    android-support-v7-preference \

    android-support-v7-recyclerview \

    android-support-v14-preference \

    androidx.slice_slice-builders \

    androidx.slice_slice-core \

    androidx.slice_slice-view \

    androidx.core_core \

    androidx.legacy_legacy-support-v4 \

    androidx.legacy_legacy-support-v13 \

    androidx.appcompat_appcompat \

    androidx.cardview_cardview \

    androidx.preference_preference \

    androidx.recyclerview_recyclerview \

    androidx.legacy_legacy-preference-v14 \



LOCAL_JAVA_LIBRARIES := \

    bouncycastle \
@@ -39,8 +39,8 @@ LOCAL_JAVA_LIBRARIES := \ 
    ims-common



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-arch-lifecycle-runtime \

    android-arch-lifecycle-extensions \

    androidx.lifecycle_lifecycle-runtime \

    androidx.lifecycle_lifecycle-extensions \

    guava \

    jsr305 \

    settings-logtags \

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ 
            android:usesCleartextTraffic="true"

            android:defaultToDeviceProtectedStorage="true"

            android:directBootAware="true"

            android:appComponentFactory="android.support.v4.app.CoreComponentFactory">

            android:appComponentFactory="androidx.core.app.CoreComponentFactory">



        <uses-library android:name="org.apache.http.legacy" />

        <!-- Settings -->
@@ -2806,7 +2806,7 @@ 
        </receiver>



        <provider

            android:name="android.support.v4.content.FileProvider"

            android:name="androidx.core.content.FileProvider"

            android:authorities="com.android.settings.files"

            android:grantUriPermissions="true"

            android:exported="false">

proguard.flags

+3 −3
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ 
}



# Keep annotated classes or class members.

-keep @android.support.annotation.Keep class *

-keep @androidx.annotation.Keep class *

-keepclassmembers class * {

    @android.support.annotation.Keep *;

    @androidx.annotation.Keep *;

}



# Keep specific fields used via reflection.
@@ -51,4 +51,4 @@ 
    public static ** SEARCH_INDEX_DATA_PROVIDER;

    public static ** SUMMARY_PROVIDER_FACTORY;

}

-keep class android.support.v4.app.CoreComponentFactory
 
-keep class androidx.core.app.CoreComponentFactory

res/layout/app_preference_item.xml

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
        android:minWidth="56dp"

        android:paddingTop="4dp"

        android:paddingBottom="4dp">

        <android.support.v7.internal.widget.PreferenceImageView

        <androidx.preference.internal.PreferenceImageView

            android:id="@android:id/icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

res/layout/choose_lock_password.xml

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
                android:imeOptions="actionNext|flagNoExtractUi|flagForceAscii"

                style="@style/TextAppearance.PasswordEntry"/>



            <android.support.v7.widget.RecyclerView

            <androidx.recyclerview.widget.RecyclerView

                android:id="@+id/password_requirements_view"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"/>