Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d73745da authored by AdrianDC's avatar AdrianDC Committed by Adrian DC
Browse files

Settings: Fix the SoundSettings activity and intents 



 * Mainly fixes the QS Volume Panel long-press

Change-Id: Ie3e15255ba5f9ef9a3702ed28b72daa3e348536b
Signed-off-by: default avatarAdrianDC <radian.dc@gmail.com>
parent ae6f0928

AndroidManifest.xml

+6 −6
Original line number Diff line number Diff line
@@ -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>

src/com/android/settings/Settings.java

+0 −1
Original line number Diff line number Diff line
@@ -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 */ }