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

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

Merge "Tweak layouts for action button to match spec"

parents 5ff1df89 88017c84

res/layout/two_action_buttons.xml

+5 −2
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ 
    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="center"

    android:paddingTop="8dp"

    android:paddingTop="24dp"

    android:paddingStart="68dp"

    android:paddingEnd="8dp"

    android:paddingEnd="24dp"

    android:orientation="horizontal">



    <FrameLayout
@@ -42,6 +42,9 @@ 
            android:layout_height="wrap_content"

            android:layout_marginBottom="4dp" />

    </FrameLayout>

    <Space

        android:layout_width="16dp"

        android:layout_height="wrap_content" />

    <FrameLayout

        android:layout_width="0dp"

        android:layout_weight="1"

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -6824,10 +6824,10 @@ 
    <string name="zen_mode_add">Add</string>









    <!--  Do not disturb: Label for button that will turn on zen mode. [CHAR LIMIT=30] -->









    <string name="zen_mode_button_turn_on">TURN ON NOW</string>









    <string name="zen_mode_button_turn_on">Turn on now</string>

















    <!--  Do not disturb: Label for button that will turn off zen mode. [CHAR LIMIT=30] -->









    <string name="zen_mode_button_turn_off">TURN OFF NOW</string>









    <string name="zen_mode_button_turn_off">Turn off now</string>

















    <!-- [CHAR LIMIT=110] Zen mode settings footer: Footer showing end time of DND -->









    <string name="zen_mode_settings_dnd_manual_end_time">Do Not Disturb is on until <xliff:g id="formatted_time" example="7:00 AM">%s</xliff:g></string>