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

Commit 3ccbb0ff authored by Yuri Lin's avatar Yuri Lin
Browse files

Add modes to Settings homepage.

Also moves the modes entrypoints out of the sub-pages it was previously in (notifications and sound settings).

Bug: 353700470
Test: manual by opening the homepage
Flag: android.app.modes_ui
Change-Id: I53124bfed25c43fc2dabaf9c43ce0513bbfc7377
parent 8cd5a449
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1321,7 +1321,7 @@
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                       android:value="com.android.settings.notification.modes.ZenModesListFragment"/>
            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
                       android:value="@string/menu_key_notifications"/>
                       android:value="@string/menu_key_priority_modes" />
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                       android:value="true" />
        </activity>
+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@
    <string name="menu_key_battery" translatable="false">top_level_battery</string>
    <string name="menu_key_storage" translatable="false">top_level_storage</string>
    <string name="menu_key_sound" translatable="false">top_level_sound</string>
    <string name="menu_key_priority_modes" translatable="false">top_level_priority_modes</string>
    <string name="menu_key_display" translatable="false">top_level_display</string>
    <string name="menu_key_wallpaper" translatable="false">top_level_wallpaper</string>
    <string name="menu_key_accessibility" translatable="false">top_level_accessibility</string>
+0 −9
Original line number Diff line number Diff line
@@ -135,15 +135,6 @@
            settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"
        />

        <com.android.settingslib.RestrictedPreference
            android:key="modes_notifications"
            android:order="18"
            android:title="@string/zen_modes_list_title"
            settings:useAdminDisabledSummary="true"
            android:fragment="com.android.settings.notification.modes.ZenModesListFragment"
            settings:controller="com.android.settings.notification.modes.ZenModesLinkPreferenceController"
        />

        <SwitchPreferenceCompat
            android:key="lock_screen_show_only_unseen_notifs"
            android:order="19"
+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@
<PreferenceScreen
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:settings="http://schemas.android.com/apk/res-auto"
    android:title="@string/zen_modes_list_title">
    android:title="@string/zen_modes_list_title"
    android:key="modes_list_settings">

    <com.android.settingslib.widget.TopIntroPreference
        android:title="@string/zen_modes_list_intro" />
+0 −8
Original line number Diff line number Diff line
@@ -105,14 +105,6 @@
        settings:keywords="@string/keywords_sounds_and_notifications_interruptions"
        settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"/>

    <com.android.settingslib.RestrictedPreference
        android:key="modes_notifications"
        android:order="-130"
        android:title="@string/zen_modes_list_title"
        settings:useAdminDisabledSummary="true"
        android:fragment="com.android.settings.notification.modes.ZenModesListFragment"
        settings:controller="com.android.settings.notification.modes.ZenModesLinkPreferenceController"/>

    <!-- Phone ringtone -->
    <com.android.settings.DefaultRingtonePreference
        android:key="phone_ringtone"
Loading