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

Commit be64de1f authored by George Lin's avatar George Lin Committed by Android (Google) Code Review
Browse files

Merge "Parameterize dimens (1/2)" into main

parents 7c1c9ddc 9b23ae12

res/layout/customization_option_entry_app_grid.xml

+6 −4
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingHorizontal="@dimen/customization_option_entry_horizontal_padding"

    android:paddingVertical="@dimen/customization_option_entry_vertical_padding"

    android:clickable="true">



    <TextView
@@ -27,7 +29,7 @@ 
        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:text="@string/grid_title"

        android:layout_marginEnd="8dp"

        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"

        app:layout_constraintBottom_toTopOf="@+id/option_entry_app_grid_description"
@@ -39,7 +41,7 @@ 
        style="@style/SectionSubtitleTextStyle"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginEnd="8dp"

        android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"

        android:text="4x4"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toStartOf="@+id/option_entry_app_grid_icon"
@@ -48,8 +50,8 @@ 


    <FrameLayout

        android:id="@+id/option_entry_app_grid_icon"

        android:layout_width="60dp"

        android:layout_height="60dp"

        android:layout_width="@dimen/customization_option_entry_icon_size"

        android:layout_height="@dimen/customization_option_entry_icon_size"

        android:orientation="horizontal"

        android:background="@drawable/customization_option_entry_icon_background"

        app:layout_constraintEnd_toEndOf="parent"

res/layout/customization_option_entry_app_shape.xml

+5 −3
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingHorizontal="@dimen/customization_option_entry_horizontal_padding"

    android:paddingVertical="@dimen/customization_option_entry_vertical_padding"

    android:clickable="true">



    <TextView
@@ -26,7 +28,7 @@ 
        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:text="@string/preview_name_shape"

        android:layout_marginEnd="8dp"

        android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toStartOf="@+id/option_entry_app_shape_icon"

        app:layout_constraintBottom_toBottomOf="parent"
@@ -35,8 +37,8 @@ 


    <FrameLayout

        android:id="@+id/option_entry_app_shape_icon"

        android:layout_width="60dp"

        android:layout_height="60dp"

        android:layout_width="@dimen/customization_option_entry_icon_size"

        android:layout_height="@dimen/customization_option_entry_icon_size"

        android:orientation="horizontal"

        android:background="@drawable/customization_option_entry_icon_background"

        app:layout_constraintEnd_toEndOf="parent"

res/layout/customization_option_entry_clock.xml

+5 −3
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingHorizontal="@dimen/customization_option_entry_horizontal_padding"

    android:paddingVertical="@dimen/customization_option_entry_vertical_padding"

    android:clickable="true">



    <TextView
@@ -26,7 +28,7 @@ 
        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:text="@string/clock_title"

        android:layout_marginEnd="8dp"

        android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toStartOf="@+id/option_entry_clock_icon"

        app:layout_constraintBottom_toBottomOf="parent"
@@ -35,8 +37,8 @@ 


    <FrameLayout

        android:id="@+id/option_entry_clock_icon"

        android:layout_width="60dp"

        android:layout_height="60dp"

        android:layout_width="@dimen/customization_option_entry_icon_size"

        android:layout_height="@dimen/customization_option_entry_icon_size"

        android:orientation="horizontal"

        android:background="@drawable/customization_option_entry_icon_background"

        app:layout_constraintEnd_toEndOf="parent"

res/layout/customization_option_entry_colors.xml

+5 −3
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingHorizontal="@dimen/customization_option_entry_horizontal_padding"

    android:paddingVertical="@dimen/customization_option_entry_vertical_padding"

    android:clickable="true">



    <TextView
@@ -26,7 +28,7 @@ 
        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:text="@string/color_picker_title"

        android:layout_marginEnd="8dp"

        android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toStartOf="@+id/option_entry_clock_icon"

        app:layout_constraintBottom_toBottomOf="parent"
@@ -35,8 +37,8 @@ 


    <FrameLayout

        android:id="@+id/option_entry_clock_icon"

        android:layout_width="60dp"

        android:layout_height="60dp"

        android:layout_width="@dimen/customization_option_entry_icon_size"

        android:layout_height="@dimen/customization_option_entry_icon_size"

        android:orientation="horizontal"

        android:background="@drawable/customization_option_entry_icon_background"

        app:layout_constraintEnd_toEndOf="parent"

res/layout/customization_option_entry_keyguard_quick_affordance.xml

+6 −4
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingHorizontal="@dimen/customization_option_entry_horizontal_padding"

    android:paddingVertical="@dimen/customization_option_entry_vertical_padding"

    android:clickable="true">



    <TextView
@@ -28,7 +30,7 @@ 
        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:text="@string/keyguard_quick_affordance_title"

        android:layout_marginEnd="8dp"

        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"
@@ -40,7 +42,7 @@ 
        style="@style/SectionSubtitleTextStyle"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginEnd="8dp"

        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"
@@ -50,8 +52,8 @@ 


    <LinearLayout

        android:id="@+id/option_entry_keyguard_quick_affordance_icon"

        android:layout_width="60dp"

        android:layout_height="60dp"

        android:layout_width="@dimen/customization_option_entry_icon_size"

        android:layout_height="@dimen/customization_option_entry_icon_size"

        android:orientation="horizontal"

        android:background="@drawable/customization_option_entry_icon_background"

        android:divider="@drawable/horizontal_divider_14dp"