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

Commit 32fc8615 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Display cast/print/storage settings to restricted users."

parents 90cbcce9 c580b91c

AndroidManifest.xml

+2 −13
Original line number Diff line number Diff line
@@ -1945,11 +1945,11 @@ 
                <category android:name="android.intent.category.DEFAULT" />

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

            </intent-filter>

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

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

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

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

                android:value="com.android.settings.category.system" />

                android:value="com.android.settings.category.ia.device" />

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

                android:value="com.android.settings.print.PrintSettingsFragment" />

        </activity>
@@ -3100,17 +3100,6 @@ 
                       android:value="com.android.settings.applications.ProcessStatsSummary" />

        </activity-alias>



        <activity-alias android:name="PrintDashboardAlias"

                        android:targetActivity="Settings$PrintSettingsActivity">

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

                <action android:name="com.android.settings.action.SETTINGS"/>

            </intent-filter>

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

                       android:value="com.android.settings.print.PrintSettingsFragment" />

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

                       android:value="com.android.settings.category.ia.device" />

        </activity-alias>



        <activity-alias android:name="ManageApplicationsDashboardAlias"

                        android:targetActivity="Settings$ManageApplicationsActivity">

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

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

+3 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ import com.android.settings.applications.AppAndNotificationDashboardFragment; 
import com.android.settings.applications.DrawOverlayDetails;

import com.android.settings.applications.InstalledAppDetails;

import com.android.settings.applications.ManageApplications;

import com.android.settings.applications.assist.ManageAssist;

import com.android.settings.applications.ManageDomainUrls;

import com.android.settings.applications.NotificationApps;

import com.android.settings.applications.PictureInPictureSettings;
@@ -62,6 +61,7 @@ import com.android.settings.applications.ProcessStatsUi; 
import com.android.settings.applications.UsageAccessDetails;

import com.android.settings.applications.VrListenerSettings;

import com.android.settings.applications.WriteSettingsDetails;

import com.android.settings.applications.assist.ManageAssist;

import com.android.settings.bluetooth.BluetoothSettings;

import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;

import com.android.settings.dashboard.SupportFragment;
@@ -273,7 +273,9 @@ public class SettingsGateway { 
            // Home page

            Settings.NetworkDashboardActivity.class.getName(),

            Settings.ConnectedDeviceDashboardActivity.class.getName(),

            Settings.WifiDisplaySettingsActivity.class.getName(),

            Settings.AppAndNotificationDashboardActivity.class.getName(),

            Settings.StorageDashboardActivity.class.getName(),

            "com.android.settings.SoundDashboardAlias",

            "com.android.settings.SecurityDashboardAlias",

            "com.android.settings.UsersDashboardAlias",