am 5b01c0b3: Merge "Fix bug #15433763 "Sounds & Notifications" appears twice in the shortcut icon picker" into lmp-preview-dev

* commit '5b01c0b3ebf18a22b8ecbe0e09ff39807e574040':
  Fix bug #15433763 "Sounds & Notifications" appears twice in the shortcut icon picker
This commit is contained in:
Fabrice Di Meglio
2014-06-05 09:47:53 +00:00
committed by Android Git Automerger

View File

@@ -1697,7 +1697,6 @@
<action android:name="android.settings.SOUND_SETTINGS" /> <action android:name="android.settings.SOUND_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" /> <category android:name="android.intent.category.VOICE_LAUNCH" />
<category android:name="com.android.settings.SHORTCUT" />
</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.notification.NotificationSettings" /> android:value="com.android.settings.notification.NotificationSettings" />