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

Commit 226e60f3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add a header before the icon list in the new/rename mode screen" into main

parents e6d08e9f f620f854

res/layout/modes_edit_name.xml

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ 
    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:paddingBottom="8dp">



    <EditText

        android:layout_width="match_parent"

res/layout/modes_icon_list.xml

+1 −2
Original line number Diff line number Diff line
@@ -28,8 +28,7 @@ 
        android:layout_height="wrap_content"

        android:clipToPadding="true"

        android:nestedScrollingEnabled="false"

        android:paddingStart="12dp"

        android:paddingEnd="12dp"

        android:padding="12dp"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -9585,6 +9585,9 @@ 
    <!-- Modes: Hint for the EditText for editing a mode's name [CHAR LIMIT=30] -->

    <string name="zen_mode_edit_name_hint">Mode name</string>









    <!-- Modes: Text shown above the list of icons in the mode editor. [CHAR LIMIT=40] -->









    <string name="zen_mode_edit_choose_icon_title">Choose an icon</string>

















    <!-- Modes: Trigger title for modes of type SCHEDULE_CALENDAR. [CHAR LIMIT=30] -->









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









    <!-- Modes: Trigger title for modes of type BEDTIME. [CHAR LIMIT=30] -->

























res/xml/modes_edit_name_icon.xml



+9
−7






























Original line number
Diff line number
Diff line







@@ -33,13 +33,15 @@







        android:key="name"









        android:layout="@layout/modes_edit_name" />



















    <com.android.settings.applications.SpacePreference









        android:layout_height="32dp" />









    <PreferenceCategory









        android:title="@string/zen_mode_edit_choose_icon_title"









        android:key="modes_filters">



















        <com.android.settingslib.widget.LayoutPreference









            android:key="icon_list"









            android:selectable="false"









            android:layout="@layout/modes_icon_list" />









    </PreferenceCategory>



















    <com.android.settingslib.widget.LayoutPreference









        android:key="done"