diff options
| author | AdrianDC <radian.dc@gmail.com> | 2015-12-17 00:42:59 +0100 |
|---|---|---|
| committer | Adrian DC <radian.dc@gmail.com> | 2015-12-16 15:51:47 -0800 |
| commit | d73745da2f4b17226942e8245a7a24e8040fb179 (patch) | |
| tree | eb4245142dc10b1f5395ec9b12b84ddf521f7d39 | |
| parent | ae6f0928cfb563bb29d0a2699a5618b856d24c9d (diff) | |
| download | packages_apps_Settings-d73745da2f4b17226942e8245a7a24e8040fb179.zip packages_apps_Settings-d73745da2f4b17226942e8245a7a24e8040fb179.tar.gz packages_apps_Settings-d73745da2f4b17226942e8245a7a24e8040fb179.tar.bz2 | |
Settings: Fix the SoundSettings activity and intents
* Mainly fixes the QS Volume Panel long-press
Change-Id: Ie3e15255ba5f9ef9a3702ed28b72daa3e348536b
Signed-off-by: AdrianDC <radian.dc@gmail.com>
| -rwxr-xr-x | AndroidManifest.xml | 12 | ||||
| -rw-r--r-- | src/com/android/settings/Settings.java | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 75065cf..0b7ae29 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2428,7 +2428,7 @@ android:resource="@id/sound_settings" /> </activity> - <activity android:name="Settings$NotificationSettingsActivity" + <activity android:name="Settings$SoundSettingsActivity" android:label="@string/notification_settings" android:exported="true" android:taskAffinity=""> @@ -2442,7 +2442,7 @@ <category android:name="com.android.settings.SHORTCUT" /> </intent-filter> <meta-data android:name="com.android.settings.FRAGMENT_CLASS" - android:value="com.android.settings.notification.NotificationSettings" /> + android:value="com.android.settings.notification.SoundSettings" /> <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID" android:resource="@id/sound_settings" /> <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED" @@ -2453,7 +2453,7 @@ <activity-alias android:name="Settings$SoundSettingsActivity" android:label="@string/notification_settings" android:taskAffinity="" - android:targetActivity="Settings$NotificationSettingsActivity"> + android:targetActivity="Settings$SoundSettingsActivity"> <intent-filter android:priority="1"> <action android:name="com.android.settings.SOUND_SETTINGS" /> <action android:name="android.settings.SOUND_SETTINGS" /> @@ -2465,7 +2465,7 @@ <category android:name="android.intent.category.VOICE_LAUNCH" /> </intent-filter> <meta-data android:name="com.android.settings.FRAGMENT_CLASS" - android:value="com.android.settings.notification.NotificationSettings" /> + android:value="com.android.settings.notification.SoundSettings" /> <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID" android:resource="@id/sound_settings" /> <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED" @@ -2476,9 +2476,9 @@ <activity-alias android:name="SoundSettings" android:label="@string/notification_settings" android:exported="true" - android:targetActivity="Settings$NotificationSettingsActivity"> + android:targetActivity="Settings$SoundSettingsActivity"> <meta-data android:name="com.android.settings.FRAGMENT_CLASS" - android:value="com.android.settings.notification.NotificationSettings" /> + android:value="com.android.settings.notification.SoundSettings" /> <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID" android:resource="@id/sound_settings" /> </activity-alias> diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index d78da1b..1863ce2 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -104,7 +104,6 @@ public class Settings extends SettingsActivity { public static class ZenModeScheduleRuleSettingsActivity extends SettingsActivity { /* empty */ } public static class ZenModeEventRuleSettingsActivity extends SettingsActivity { /* empty */ } public static class ZenModeExternalRuleSettingsActivity extends SettingsActivity { /* empty */ } - public static class NotificationSettingsActivity extends SettingsActivity { /* empty */ } public static class NotificationAppListActivity extends SettingsActivity { /* empty */ } public static class AppNotificationSettingsActivity extends SettingsActivity { /* empty */ } public static class OtherSoundSettingsActivity extends SettingsActivity { /* empty */ } |