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

Commit c38245f9 authored by Zoltan Szatmary-Ban's avatar Zoltan Szatmary-Ban Committed by Android (Google) Code Review
Browse files

Merge "Add PRIMARY_PROFILE_CONTROLLED to Settings > App activity manifests"

parents bc695c77 de7d4988

AndroidManifest.xml

+8 −0
Original line number Diff line number Diff line
@@ -771,6 +771,8 @@ 
                android:value="com.android.settings.applications.ManageApplications" />

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

                android:resource="@id/application_settings" />

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

                android:value="true" />

        </activity>



        <activity android:name="Settings$AllApplicationsActivity"
@@ -784,6 +786,8 @@ 
                android:value="com.android.settings.applications.ManageApplications" />

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

                android:resource="@id/application_settings" />

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

                android:value="true" />

        </activity>



        <!-- Keep compatibility with old shortcuts. -->
@@ -865,6 +869,8 @@ 
                android:value="com.android.settings.applications.ManageApplications" />

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

                android:resource="@id/application_settings" />

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

                android:value="true" />

        </activity>



        <!-- Provide direct entry into manage apps showing storage usage of apps. -->
@@ -886,6 +892,8 @@ 
                android:value="com.android.settings.applications.ManageApplications" />

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

                android:resource="@id/application_settings" />

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

                android:value="true" />

        </activity>



        <activity android:name="Settings$NotificationStationActivity"