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

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

Merge "Updates main page for Do Not Disturb" into rvc-dev

parents 6f4a9bf1 509273cc
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@
        android:layout_height="wrap_content"
        android:layout_gravity="left"
        android:gravity="center"
        android:paddingTop="@dimen/zen_mode_button_padding_vertical"
        android:text="@string/zen_mode_button_turn_on"/>

    <Button
@@ -51,7 +50,6 @@
        android:layout_height="wrap_content"
        android:layout_gravity="left"
        android:gravity="center"
        android:paddingTop="@dimen/zen_mode_button_padding_vertical"
        android:text="@string/zen_mode_button_turn_off" />

</LinearLayout>
 No newline at end of file
+44 −105

File changed.

Preview size limit exceeded, changes collapsed.

+8 −9
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@
        android:title="@string/zen_mode_settings_title"
        android:selectable="false"
        android:layout="@layout/zen_mode_settings_button"
        settings:allowDividerAbove="true"
        settings:allowDividerBelow="true"
        settings:keywords="@string/keywords_zen_mode_settings"/>

@@ -55,26 +54,26 @@
    <!-- Automatic rules -->
    <Preference
        android:key="zen_mode_automation_settings"
        android:title="@string/zen_mode_automation_settings_title"
        android:title="@string/zen_category_schedule"
        settings:allowDividerAbove="true"
        settings:allowDividerBelow="true"
        android:fragment="com.android.settings.notification.zen.ZenModeAutomationSettings"/>

    <PreferenceCategory
        android:key="zen_mode_settings_advanced"
        settings:initialExpandedChildrenCount="1">
        settings:initialExpandedChildrenCount="0">

        <!-- DND duration settings -->
        <com.android.settings.notification.zen.ZenDurationDialogPreference
            android:key="zen_mode_duration_settings"
            android:title="@string/zen_category_duration"
            android:widgetLayout="@null"/>

        <!-- What to block (effects) -->
        <Preference
            android:key="zen_mode_block_effects_settings"
            android:title="@string/zen_mode_restrict_notifications_title"
            android:fragment="com.android.settings.notification.zen.ZenModeRestrictNotificationsSettings" />

        <!-- DND duration settings -->
        <com.android.settings.notification.zen.ZenDurationDialogPreference
            android:key="zen_mode_duration_settings"
            android:title="@string/zen_mode_duration_settings_title"
            android:widgetLayout="@null"/>
    </PreferenceCategory>

    <!-- Footer that shows if user is put into alarms only or total silence mode by an app -->
+155 −9

File changed.

Preview size limit exceeded, changes collapsed.

+32 −4

File changed.

Preview size limit exceeded, changes collapsed.

Loading