From de7d498832b008313bb6baf8623b9a2d4a0fc959 Mon Sep 17 00:00:00 2001
From: Zoltan Szatmary-Ban <szatmz@google.com>
Date: Tue, 31 Mar 2015 19:49:18 +0100
Subject: [PATCH] Add PRIMARY_PROFILE_CONTROLLED to Settings > App activity
 manifests

This is necessary since the introduction of unified view of managed and
primary apps on that screen.

Bug: 20007125
Change-Id: I20872570563c6248bac6591ba8ab83a730b2e49b
---
 AndroidManifest.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 125e90edc4b..35e679d08b0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -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"