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

Splits out ACTION_MAIN intent filter for Settings and doesn't

Browse Source 
forward it.

This is required so that general queries for ACTION_MAIN apps
do not get stuck with the IntentForwarderActivity.

Bug: 17053933
Change-Id: Ie04e2b29f2467e14fd82d27c1e94d93eda90f4c1
This commit is contained in:
Alexandra Gherghina
2014-09-05 11:42:51 +01:00
parent 1e0ea45263
commit 05dec7fc69
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
AndroidManifest.xml
View File

@@ -86,15 +86,26 @@
android:label="@string/settings_label_launcher" android:label="@string/settings_label_launcher"
android:launchMode="singleTask"> android:launchMode="singleTask">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.SETTINGS" /> <action android:name="android.settings.SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED" <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" /> android:value="true" />
</activity> </activity>
<!-- Alias for launcher activity only, as this belongs to each profile. -->
<activity-alias android:name="Settings"
android:taskAffinity="com.android.settings"
android:label="@string/settings_label_launcher"
android:launchMode="singleTask"
android:targetActivity="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity-alias>
<receiver android:name="ManagedProfileSetup"> <receiver android:name="ManagedProfileSetup">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.USER_INITIALIZE"/> <action android:name="android.intent.action.USER_INITIALIZE"/>