commit aea17023389add13d20b3094e9f6067f92eba714
author Nicolas Prevot <nprevot@google.com> Mon Feb 29 13:49:31 2016 +0000
committer Nicolas Prevot <nprevot@google.com> Mon Feb 29 13:49:31 2016 +0000
tree 2be9f037ba62aa5cc03bc2336698990d36625416
parent b671780528d53e7bfab5e66f439fa682890b336d

Make some Settings intent filters cross-profile again.

The intents:
INPUT_METHOD_SETTINGS, MANAGE_DEFAULT_APPS_SETTINGS and HOME_SETTINGS
were not handled in the parent any more. Handle them in the parent.

BUG:27240411
Change-Id: I42da3ce37901ba3e9f5c8004db53e49bc2f9ed24

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 49c6790..634d684 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -609,6 +609,8 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.inputmethod.AvailableVirtualKeyboardFragment" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
         </activity>
 
         <activity android:name="Settings$ManageAssistActivity"
@@ -2782,14 +2784,13 @@
                   android:exported="true">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MANAGE_DEFAULT_APPS_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
                 <action android:name="android.settings.HOME_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                        android:value="com.android.settings.applications.AdvancedAppSettings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                        android:value="true" />
         </activity>
 
         <service