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

Commit 8b1b6977 authored by Shafik Nassar's avatar Shafik Nassar Committed by Android (Google) Code Review
Browse files

Merge "Add activities to handle external storage intents"

parents d4089984 a54d7a8f

AndroidManifest.xml

+26 −0
Original line number Diff line number Diff line
@@ -2842,6 +2842,32 @@ 
            </intent-filter>

        </activity>



        <activity

            android:name="Settings$ManageExternalStorageActivity"

            android:label="@string/manage_external_storage_title">

            <intent-filter android:priority="1">

                <action android:name="android.settings.MANAGE_ALL_FILES_ACCESS_PERMISSION" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.applications.manageapplications.ManageApplications" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                       android:value="true" />

        </activity>



        <activity

            android:name="Settings$AppManageExternalStorageActivity"

            android:label="@string/manage_external_storage_title"

            android:permission="android.permission.MANAGE_EXTERNAL_STORAGE">

            <intent-filter android:priority="1">

                <action android:name="android.settings.MANAGE_APP_ALL_FILES_ACCESS_PERMISSION" />

                <category android:name="android.intent.category.DEFAULT" />

                <data android:scheme="package" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.applications.appinfo.ManageExternalStorageDetails" />

        </activity>



        <!-- Keep compatibility with old WebView-picker implementation -->

        <activity-alias android:name=".WebViewImplementation"

                  android:targetActivity="Settings$WebViewAppPickerActivity"

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ public class Settings extends SettingsActivity { 
    public static class AppMemoryUsageActivity extends SettingsActivity { /* empty */ }

    public static class OverlaySettingsActivity extends SettingsActivity { /* empty */ }

    public static class ManageExternalStorageActivity extends SettingsActivity { /* empty */ }

    public static class AppManageExternalStorageActivity extends SettingsActivity { /* empty */ }

    public static class WriteSettingsActivity extends SettingsActivity { /* empty */ }

    public static class ChangeWifiStateActivity extends SettingsActivity { /* empty */ }

    public static class AppDrawOverlaySettingsActivity extends SettingsActivity { /* empty */ }

src/com/android/settings/core/gateway/SettingsGateway.java

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import com.android.settings.applications.UsageAccessDetails; 
import com.android.settings.applications.appinfo.AppInfoDashboardFragment;

import com.android.settings.applications.appinfo.DrawOverlayDetails;

import com.android.settings.applications.appinfo.ExternalSourcesDetails;

import com.android.settings.applications.appinfo.ManageExternalStorageDetails;

import com.android.settings.applications.appinfo.WriteSettingsDetails;

import com.android.settings.applications.appops.BackgroundCheckSummary;

import com.android.settings.applications.assist.ManageAssist;
@@ -256,6 +257,7 @@ public class SettingsGateway { 
            DrawOverlayDetails.class.getName(),

            WriteSettingsDetails.class.getName(),

            ExternalSourcesDetails.class.getName(),

            ManageExternalStorageDetails.class.getName(),

            WallpaperTypeSettings.class.getName(),

            VrListenerSettings.class.getName(),

            PictureInPictureSettings.class.getName(),