commit e0069d332d5fc306e3eb60498a0a6a9087d34e65
author Aurimas Liutikas <aurimas@google.com> Tue Apr 17 11:22:43 2018 -0700
committer Aurimas Liutikas <aurimas@google.com> Fri Apr 20 12:52:29 2018 -0700
tree 22e69164951e50ac615da65dae5b56e5d53d7ea1
parent 538a4594ffdc90ff71fbb87a57d62b88d2620f40

Migrate Settings to androidx.

Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index dbb662c..69416a7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -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 -->
@@ -2828,7 +2828,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">