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

Commit cb8cdb43 authored by Catherine Liang's avatar Catherine Liang Committed by Android (Google) Code Review
Browse files

Merge "Bind customization option colors" into main

parents 0c1fc105 ad8a2809

res/layout/customization_option_entry_app_shape_grid.xml

+8 −8
Original line number Diff line number Diff line
@@ -24,31 +24,31 @@ 
    android:clickable="true">



    <TextView

        android:id="@+id/option_entry_app_shape_grid_title"

        android:id="@+id/option_entry_title"

        style="@style/CustomizationOptionEntryTitleTextStyle"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:text="@string/shape_and_grid_title"

        android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toStartOf="@+id/option_entry_app_grid_icon_container"

        app:layout_constraintBottom_toTopOf="@+id/option_entry_app_shape_grid_description"

        app:layout_constraintEnd_toStartOf="@+id/option_entry_icon_container"

        app:layout_constraintBottom_toTopOf="@+id/option_entry_description"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintVertical_chainStyle="packed" />



    <TextView

        android:id="@+id/option_entry_app_shape_grid_description"

        android:id="@+id/option_entry_description"

        style="@style/CustomizationOptionEntrySubtitleTextStyle"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toStartOf="@+id/option_entry_app_grid_icon_container"

        app:layout_constraintEnd_toStartOf="@+id/option_entry_icon_container"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toBottomOf="@+id/option_entry_app_shape_grid_title" />

        app:layout_constraintTop_toBottomOf="@+id/option_entry_title" />



    <FrameLayout

        android:id="@+id/option_entry_app_grid_icon_container"

        android:id="@+id/option_entry_icon_container"

        android:layout_width="@dimen/customization_option_entry_icon_size"

        android:layout_height="@dimen/customization_option_entry_icon_size"

        android:padding="@dimen/customization_option_entry_icon_padding"
@@ -58,7 +58,7 @@ 
        app:layout_constraintBottom_toBottomOf="parent">



        <ImageView

            android:id="@+id/option_entry_app_shape_grid_icon"

            android:id="@+id/option_entry_icon"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:contentDescription="@string/grid_preview_card_content_description" />

res/layout/customization_option_entry_clock.xml

+4 −3
Original line number Diff line number Diff line
@@ -24,19 +24,20 @@ 
    android:clickable="true">



    <TextView

        android:id="@+id/option_entry_title"

        style="@style/CustomizationOptionEntryTitleTextStyle"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:text="@string/clock_title"

        android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toStartOf="@+id/option_entry_clock_icon_container"

        app:layout_constraintEnd_toStartOf="@+id/option_entry_icon_container"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintVertical_chainStyle="packed" />



    <FrameLayout

        android:id="@+id/option_entry_clock_icon_container"

        android:id="@+id/option_entry_icon_container"

        android:layout_width="@dimen/customization_option_entry_icon_size"

        android:layout_height="@dimen/customization_option_entry_icon_size"

        android:background="@drawable/customization_option_entry_icon_background"
@@ -45,7 +46,7 @@ 
        app:layout_constraintBottom_toBottomOf="parent">



        <ImageView

            android:id="@+id/option_entry_clock_icon"

            android:id="@+id/option_entry_icon"

            android:layout_width="@dimen/customization_option_entry_clock_icon_size"

            android:layout_height="@dimen/customization_option_entry_clock_icon_size"

            android:layout_gravity="center"/>

res/layout/customization_option_entry_color_contrast.xml

+8 −8
Original line number Diff line number Diff line
@@ -24,31 +24,31 @@ 
    android:clickable="true">



    <TextView

        android:id="@+id/option_entry_color_contrast_title"

        android:id="@+id/option_entry_title"

        style="@style/CustomizationOptionEntryTitleTextStyle"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:text="@string/color_contrast_section_title"

        android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toStartOf="@+id/option_entry_color_contrast_icon_container"

        app:layout_constraintBottom_toTopOf="@+id/option_entry_color_contrast_description"

        app:layout_constraintEnd_toStartOf="@+id/option_entry_icon_container"

        app:layout_constraintBottom_toTopOf="@+id/option_entry_description"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintVertical_chainStyle="packed" />



    <TextView

        android:id="@+id/option_entry_color_contrast_description"

        android:id="@+id/option_entry_description"

        style="@style/CustomizationOptionEntrySubtitleTextStyle"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toStartOf="@+id/option_entry_color_contrast_icon_container"

        app:layout_constraintEnd_toStartOf="@+id/option_entry_icon_container"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toBottomOf="@+id/option_entry_color_contrast_title" />

        app:layout_constraintTop_toBottomOf="@+id/option_entry_title" />



    <FrameLayout

        android:id="@+id/option_entry_color_contrast_icon_container"

        android:id="@+id/option_entry_icon_container"

        android:layout_width="@dimen/customization_option_entry_icon_size"

        android:layout_height="@dimen/customization_option_entry_icon_size"

        android:padding="@dimen/customization_option_entry_icon_padding"
@@ -58,7 +58,7 @@ 
        app:layout_constraintBottom_toBottomOf="parent">



        <ImageView

            android:id="@+id/option_entry_color_contrast_icon"

            android:id="@+id/option_entry_icon"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:contentDescription="@string/grid_preview_card_content_description" />

res/layout/customization_option_entry_colors.xml

+4 −3
Original line number Diff line number Diff line
@@ -24,19 +24,20 @@ 
    android:clickable="true">



    <TextView

        android:id="@+id/option_entry_title"

        style="@style/CustomizationOptionEntryTitleTextStyle"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:text="@string/system_colors_title"

        android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toStartOf="@+id/option_entry_colors_icon_container"

        app:layout_constraintEnd_toStartOf="@+id/option_entry_icon_container"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintVertical_chainStyle="packed" />



    <FrameLayout

        android:id="@+id/option_entry_colors_icon_container"

        android:id="@+id/option_entry_icon_container"

        android:layout_width="@dimen/customization_option_entry_icon_size"

        android:layout_height="@dimen/customization_option_entry_icon_size"

        android:orientation="horizontal"
@@ -46,7 +47,7 @@ 
        app:layout_constraintBottom_toBottomOf="parent">



        <com.android.customization.picker.color.ui.view.ColorOptionIconView2

            android:id="@+id/option_entry_colors_icon"

            android:id="@+id/option_entry_icon"

            android:layout_width="@dimen/customization_option_entry_color_icon_size"

            android:layout_height="@dimen/customization_option_entry_color_icon_size"

            android:layout_gravity="center"/>

res/layout/customization_option_entry_keyguard_quick_affordance.xml

+9 −9
Original line number Diff line number Diff line
@@ -25,33 +25,33 @@ 
    android:clickable="true">



    <TextView

        android:id="@+id/option_entry_keyguard_quick_affordance_title"

        android:id="@+id/option_entry_title"

        style="@style/CustomizationOptionEntryTitleTextStyle"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:text="@string/keyguard_quick_affordance_title"

        android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toStartOf="@+id/option_entry_keyguard_quick_affordance_icon"

        app:layout_constraintBottom_toTopOf="@+id/option_entry_keyguard_quick_affordance_description"

        app:layout_constraintEnd_toStartOf="@+id/option_entry_icon_container"

        app:layout_constraintBottom_toTopOf="@+id/option_entry_description"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintVertical_chainStyle="packed" />



    <TextView

        android:id="@+id/option_entry_keyguard_quick_affordance_description"

        android:id="@+id/option_entry_description"

        style="@style/CustomizationOptionEntrySubtitleTextStyle"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"

        android:text="None"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toStartOf="@+id/option_entry_keyguard_quick_affordance_icon"

        app:layout_constraintEnd_toStartOf="@+id/option_entry_icon_container"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toBottomOf="@+id/option_entry_keyguard_quick_affordance_title"

        app:layout_constraintTop_toBottomOf="@+id/option_entry_title"

        tools:text="Wallet, Nest" />



    <LinearLayout

        android:id="@+id/option_entry_keyguard_quick_affordance_icon"

        android:id="@+id/option_entry_icon_container"

        android:layout_width="@dimen/customization_option_entry_icon_size"

        android:layout_height="@dimen/customization_option_entry_icon_size"

        android:orientation="horizontal"
@@ -65,14 +65,14 @@ 
        app:layout_constraintBottom_toBottomOf="parent">



        <ImageView

            android:id="@+id/option_entry_keyguard_quick_affordance_icon_1"

            android:id="@+id/option_entry_icon_1"

            android:layout_width="@dimen/customization_option_entry_shortcut_icon_size"

            android:layout_height="@dimen/customization_option_entry_shortcut_icon_size"

            android:visibility="gone"

            android:tint="@color/system_on_surface" />



        <ImageView

            android:id="@+id/option_entry_keyguard_quick_affordance_icon_2"

            android:id="@+id/option_entry_icon_2"

            android:layout_width="@dimen/customization_option_entry_shortcut_icon_size"

            android:layout_height="@dimen/customization_option_entry_shortcut_icon_size"

            android:visibility="gone"