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

Commit f5eda4ab authored by Jason Thai's avatar Jason Thai Committed by Android (Google) Code Review
Browse files

Merge "Match height for ColorSectionView and WallpaperQuickSwitchView" into main

parents f2091c41 744ce207

res/drawable/color_overflow.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
        <shape

            android:shape="ring"

            android:innerRadius="@dimen/component_color_overflow_small_radius_default"

            android:thickness="-1dp"

            android:thickness="-2dp"

            android:useLevel="false">

            <solid android:color="@color/system_outline"/>

        </shape>

res/layout/color_section_view.xml

+2 −3
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:paddingVertical="20dp"

        android:paddingHorizontal="24dp"

        android:weightSum="@integer/color_section_num_columns">

        <include
@@ -53,8 +52,8 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_horizontal"

        android:layout_marginTop="10dp"

        android:minHeight="48dp"

        android:minHeight="24dp"

        android:paddingVertical="16dp"

        android:gravity="center"

        android:drawablePadding="12dp"

        android:drawableStart="@drawable/ic_nav_color"

res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ 
    <dimen name="theme_option_font_sample_width">52dp</dimen>

    <dimen name="theme_option_sample_margin">10dp</dimen>



    <!-- Dimensions for the color options -->

    <dimen name="color_options_selected_option_height">102dp</dimen>



    <!-- Note, using dp instead of sp as this text is more like a "snapshot" of the font -->

    <dimen name="theme_option_font_text_size">20dp</dimen>

    <dimen name="theme_option_font_min_text_size">15dp</dimen>

src/com/android/customization/picker/color/ui/binder/ColorSectionViewBinder.kt

+23 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ package com.android.customization.picker.color.ui.binder 
import android.content.res.Configuration

import android.view.LayoutInflater

import android.view.View

import android.view.ViewGroup

import android.widget.ImageView

import android.widget.LinearLayout

import androidx.core.view.isVisible
@@ -50,12 +51,34 @@ object ColorSectionViewBinder { 
    ) {

        val optionContainer: LinearLayout =

            view.requireViewById(R.id.color_section_option_container)

        val optionContainerLayoutParams = optionContainer.layoutParams

        val moreColorsButton: View = view.requireViewById(R.id.more_colors)

        if (isConnectedHorizontallyToOtherSections) {

            moreColorsButton.isVisible = true

            moreColorsButton.setOnClickListener(navigationOnClick)



            // Match the height of option container and the other sections when connected

            // horizontally.

            optionContainerLayoutParams.height =

                view.resources.getDimensionPixelSize(R.dimen.color_options_selected_option_height)

            optionContainer.layoutParams = optionContainerLayoutParams

            optionContainer.setPadding(

                optionContainer.paddingLeft,

                16,

                optionContainer.paddingRight,

                16

            )

        } else {

            moreColorsButton.isVisible = false



            optionContainerLayoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT

            optionContainer.layoutParams = optionContainerLayoutParams

            optionContainer.setPadding(

                optionContainer.paddingLeft,

                20,

                optionContainer.paddingRight,

                20

            )

        }

        lifecycleOwner.lifecycleScope.launch {

            lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {