PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make some Settings intent filters cross-profile again." into nyc-dev am: 8eb11e473d

Browse Source 
am: bfe0dee0eb

* commit 'bfe0dee0eb3298be3aedaf779e850a6a166d43c7':
  Make some Settings intent filters cross-profile again.
This commit is contained in:
Nicolas Prevot
2016-03-01 11:45:43 +00:00
committed by android-build-merger
parent 17c211a699 bfe0dee0eb
commit 8b8f6e4594
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
AndroidManifest.xml
View File

@@ -609,6 +609,8 @@
</intent-filter> </intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.inputmethod.AvailableVirtualKeyboardFragment" /> android:value="com.android.settings.inputmethod.AvailableVirtualKeyboardFragment" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity> </activity>
<activity android:name="Settings$ManageAssistActivity" <activity android:name="Settings$ManageAssistActivity"
@@ -2782,14 +2784,13 @@
android:exported="true"> android:exported="true">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.settings.MANAGE_DEFAULT_APPS_SETTINGS" /> <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" /> <action android:name="android.settings.HOME_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.applications.AdvancedAppSettings" /> android:value="com.android.settings.applications.AdvancedAppSettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity> </activity>
<service <service