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

Merge "Merge intent filters so intent forwarding works." into oc-dev

Browse Source 
am: dc43b64c54

Change-Id: Ideeda9cbd861a39649281b3f192f303820a4468b
This commit is contained in:
Kenny Guy
2017-04-04 21:36:58 +00:00
committed by android-build-merger
parent c7956d80e6 dc43b64c54
commit 6f802c0af3
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
AndroidManifest.xml
View File

@@ -2558,6 +2558,7 @@
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="com.android.settings.SOUND_SETTINGS" /> <action android:name="com.android.settings.SOUND_SETTINGS" />
<action android:name="android.settings.SOUND_SETTINGS" /> <action android:name="android.settings.SOUND_SETTINGS" />
<action android:name="android.settings.ACTION_OTHER_SOUND_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
@@ -2566,10 +2567,6 @@
<category android:name="android.intent.category.VOICE_LAUNCH" /> <category android:name="android.intent.category.VOICE_LAUNCH" />
<category android:name="com.android.settings.SHORTCUT" /> <category android:name="com.android.settings.SHORTCUT" />
</intent-filter> </intent-filter>
<intent-filter android:priority="1">
<action android:name="android.settings.ACTION_OTHER_SOUND_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter android:priority="6"> <intent-filter android:priority="6">
<action android:name="com.android.settings.action.SETTINGS" /> <action android:name="com.android.settings.action.SETTINGS" />
</intent-filter> </intent-filter>