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

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

Merge "Update DND strings and image spacing" into rvc-dev

parents 4d02f7b2 ecc377ba

res/layout/zen_mode_senders_image.xml

+3 −1
Original line number Diff line number Diff line
@@ -21,5 +21,7 @@ 
    <ImageView

        android:id="@+id/zen_mode_settings_senders_image"

        android:layout_width="match_parent"

        android:layout_height="wrap_content" />

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/zen_senders_image_margin_vertical"

        android:layout_marginBottom="@dimen/zen_senders_image_margin_vertical"/>

</FrameLayout>

res/layout/zen_mode_senders_overlay_image.xml

+3 −1
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
                    android:id="@+id/zen_mode_settings_senders_overlay_view"

                    android:layout_centerInParent="true"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content">

                    android:layout_height="wrap_content"

                    android:layout_marginTop="@dimen/zen_conversations_image_margin_vertical"

                    android:layout_marginBottom="@dimen/zen_conversations_image_margin_vertical">

    </RelativeLayout>

</RelativeLayout>

res/layout/zen_mode_settings_button.xml

+13 −14
Original line number Diff line number Diff line
@@ -19,37 +19,36 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:paddingVertical="@dimen/zen_mode_button_padding_vertical">

    android:orientation="vertical">



    <TextView

        android:text="@string/zen_mode_settings_summary"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/screen_margin_sides"

        android:paddingTop="@dimen/zen_mode_button_padding_vertical"

        android:paddingBottom="@dimen/zen_mode_button_padding_vertical"/>

        android:layout_marginTop="@dimen/zen_mode_settings_button_margin_vertical"/>



    <Button

        android:id="@+id/zen_mode_settings_turn_on_button"

        style="@style/ActionPrimaryButton"

        android:focusableInTouchMode="true"

        android:layout_marginStart="@dimen/screen_margin_sides"

        android:layout_marginTop="@dimen/zen_mode_settings_button_margin_vertical"

        android:layout_marginBottom="@dimen/zen_mode_settings_button_margin_vertical"

        android:text="@string/zen_mode_button_turn_on"

        android:focusableInTouchMode="true"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="left"

        android:gravity="center"

        android:text="@string/zen_mode_button_turn_on"/>

        android:layout_height="wrap_content"/>



    <Button

        android:id="@+id/zen_mode_settings_turn_off_button"

        style="@style/ActionSecondaryButton"

        android:focusableInTouchMode="true"

        android:layout_marginStart="@dimen/screen_margin_sides"

        android:layout_marginTop="@dimen/zen_mode_settings_button_margin_vertical"

        android:layout_marginBottom="@dimen/zen_mode_settings_button_margin_vertical"

        android:text="@string/zen_mode_button_turn_off"

        android:focusableInTouchMode="true"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="left"

        android:gravity="center"

        android:text="@string/zen_mode_button_turn_off" />

        android:layout_height="wrap_content"/>



</LinearLayout>
 
 No newline at end of file

res/values/dimens.xml

+7 −2
Original line number Diff line number Diff line
@@ -88,10 +88,15 @@ 
    <dimen name="notification_history_header_drawable_start">26dp</dimen>

    <dimen name="conversation_icon_size">48dp</dimen>



    <dimen name="zen_mode_button_padding_vertical">16dp</dimen>

    <dimen name="zen_mode_icon_size">36dp</dimen>

    <dimen name="zen_mode_icon_margin">16dp</dimen>

    <dimen name="zen_mode_settings_button_margin_vertical">24dp</dimen>

    <dimen name="zen_senders_image_margin_vertical">16dp</dimen>

    <dimen name="zen_conversations_image_margin_vertical">24dp</dimen>

    <dimen name="zen_conversations_icon_offset">32dp</dimen>

    <dimen name="zen_conversations_icon_size">50dp</dimen>

    <dimen name="zen_schedule_rule_checkbox_padding">7dp</dimen>

    <dimen name="zen_schedule_day_margin">17dp</dimen>

    <dimen name="zen_conversations_icon_size">56dp</dimen>



    <dimen name="rect_button_radius">8dp</dimen>

res/values/strings.xml

+8 −8
Original line number Diff line number Diff line
@@ -7956,7 +7956,7 @@ 
    <string name="zen_category_schedule">Schedules</string>

    <!-- Do not disturb settings, main screen, field, duration setting where user can specify how

    long dnd will last when toggling dnd on from qs or settings) [CHAR LIMIT=100] -->

    <string name="zen_category_duration">Set duration for Quick Settings</string>

    <string name="zen_category_duration">Duration for Quick Settings</string>









    <!-- Do not disturb settings, sound and vibrations screen footer [CHAR LIMIT=NONE]-->









    <string name="zen_sound_footer">When Do Not Disturb is on, sound and vibration will be muted, except for the items you allow above.</string>








@@ -8900,7 +8900,7 @@







    <!-- [CHAR LIMIT=120] Zen mode settings: Calls settings header -->









    <string name="zen_mode_calls_header">Calls that can interrupt</string>









    <!-- [CHAR LIMIT=NONE] Zen mode settings: Calls screen footer -->









    <string name="zen_mode_calls_footer">To be sure allowed calls make sound, check whether your device is set to ring, vibrate, or silent.</string>









    <string name="zen_mode_calls_footer">To make sure allowed calls make sound, check that device is set to ring</string>









    <!-- [CHAR LIMIT=NONE] Zen mode custom rule settings: Calls screen footer -->









    <string name="zen_mode_custom_calls_footer">For \u2018<xliff:g id="schedule_name" example="Schedule 1">%1$s</xliff:g>\u2019 incoming calls are blocked. You can adjust settings to allow your friends, family, or other contacts to reach you.</string>
















@@ -8917,11 +8917,11 @@







    <!-- [CHAR LIMIT=40] Zen mode settings: Messages option -->









    <string name="zen_mode_messages_list">messages</string>









    <!-- [CHAR LIMIT=40] Zen mode settings: Allow messages to bypass DND title -->









    <string name="zen_mode_messages_title">SMS, MMS, and messaging apps</string>









    <string name="zen_mode_messages_title">Messages</string>









    <!-- [CHAR LIMIT=120] Zen mode settings: Messages settings header -->









    <string name="zen_mode_messages_header">Messages that can interrupt</string>









    <!-- Do not disturb settings, messages, events and reminders footer [CHAR LIMIT=NONE]-->









    <string name="zen_mode_messages_footer">To be sure allowed messages make sound, check whether your device is set to ring, vibrate, or silent.</string>









    <string name="zen_mode_messages_footer">To make sure allowed messages make sound, check that device is set to ring</string>









    <!-- [CHAR LIMIT=NONE] Zen mode custom rule settings: Messages screen footer -->









    <string name="zen_mode_custom_messages_footer">For \u2018<xliff:g id="schedule_name" example="Schedule 1">%1$s</xliff:g>\u2019 incoming messages are blocked. You can adjust settings to allow your friends, family, or other contacts to reach you.</string>
















@@ -8961,14 +8961,14 @@







    <!-- [CHAR LIMIT=80] Zen mode settings: Allow media (sound from video) to bypass dnd -->









    <string name="zen_mode_media">Media sounds</string>









    <!-- [CHAR LIMIT=NONE] Zen mode settings: Allow media (sound from video) to bypass dnd  summary-->









    <string name="zen_mode_media_summary">From videos, games, and other media</string>









    <string name="zen_mode_media_summary">Sounds from videos, games, and other media</string>









    <!-- [CHAR LIMIT=50] Zen mode settings: Media (ie: sound from video) -->









    <string name="zen_mode_media_list">media</string>

















    <!-- [CHAR LIMIT=80] Zen mode settings: allow touch sounds to bypass DND  -->









    <string name="zen_mode_system">Touch sounds</string>









    <!-- [CHAR LIMIT=NONE] Zen mode settings: allow touch sounds to bypass DND summary  -->









    <string name="zen_mode_system_summary">From your keyboard and other buttons</string>









    <string name="zen_mode_system_summary">Sounds from the keyboard and other buttons</string>









    <!-- [CHAR LIMIT=50] Zen mode settings: System sounds (ie: touch sounds) -->









    <string name="zen_mode_system_list">touch sounds</string>
















@@ -8980,7 +8980,7 @@







    <string name="zen_mode_reminders_list">reminders</string>

















    <!-- [CHAR LIMIT=80] Zen mode settings: Allow event notifications/sounds to bypass DND -->









    <string name="zen_mode_events">Events</string>









    <string name="zen_mode_events">Calendar events</string>









    <!-- [CHAR LIMIT=NONE] Zen mode settings: Allow event notifications/sounds to bypass DND summary -->









    <string name="zen_mode_events_summary">From upcoming calendar events</string>









    <!-- [CHAR LIMIT=50] Zen mode settings: Events (ie: calendar events) -->








@@ -9062,7 +9062,7 @@







    <!-- [CHAR LIMIT=50] Zen mode settings: calls summary -->









    <string name="zen_mode_calls_summary_two"><xliff:g id="caller type" example="starred contacts">%1$s</xliff:g> and <xliff:g id="caller type" example="repeat callers">%2$s</xliff:g></string>









    <!-- [CHAR LIMIT=200] Zen mode settings: Repeat callers option summary -->









    <string name="zen_mode_repeat_callers_summary">If the same person calls a second time within a <xliff:g id="minutes">%d</xliff:g> minute period</string>









    <string name="zen_mode_repeat_callers_summary">If the same person calls a second time within a <xliff:g id="minutes">%d</xliff:g>-minute period</string>

















    <!-- [CHAR LIMIT=50] Zen mode settings dnd beahvior description: when a user has chosen custom sounds to bypass DND -->









    <string name="zen_mode_behavior_summary_custom">Custom</string>