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

Commit 7d00dccf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add Sound to top level settings."

parents 836a7818 55578653

AndroidManifest.xml

+14 −1
Original line number Diff line number Diff line
@@ -3095,10 +3095,23 @@ 
                       android:value="true" />

        </activity-alias>



        <activity-alias android:name="SoundDashboardAlias"

                        android:targetActivity="Settings$SoundSettingsActivity">

            <intent-filter android:priority="5">

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.category"

                       android:value="com.android.settings.category.ia.homepage" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.notification.SoundSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                       android:value="true" />

        </activity-alias>



        <activity android:name=".Settings$StorageDashboardActivity"

                  android:label="@string/storage_settings"

                  android:icon="@drawable/ic_settings_storage">

            <intent-filter android:priority="5">

            <intent-filter android:priority="4">

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.category"

src/com/android/settings/SettingsActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ public class SettingsActivity extends SettingsDrawerActivity 
            Settings.NetworkDashboardActivity.class.getName(),

            "com.android.settings.Settings.BatteryDashboardAlias",

            "com.android.settings.Settings.DisplayDashboardAlias",

            "com.android.settings.Settings.SoundDashboardAlias",

            "com.android.settings.Settings.SecurityDashboardAlias",

            Settings.SystemDashboardActivity.class.getName(),

            Settings.SupportDashboardActivity.class.getName(),