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

Commit 1598484f authored by Adam Cohen's avatar Adam Cohen
Browse files

Merging from ub-launcher3-master @ build 6552470 

Bug:154410862
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-master_rvc-d1-dev_6552470.html

Change-Id: Ieeb620c33785945c629ce9fcabc6a1cda50eda44
parents 741fbf67 f619e598

res/drawable/color_chip.xml

+3 −3
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ 
<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:state_activated="true"

        android:drawable="@drawable/color_chip_filled" />

        android:drawable="@drawable/color_chip_hollow" />

    <item

        android:state_activated="false"

        android:drawable="@drawable/color_chip_hollow" />

        android:drawable="@drawable/color_chip_filled" />

    <item

        android:drawable="@drawable/color_chip_hollow"/>

        android:drawable="@drawable/color_chip_filled"/>

</selector>
 
 No newline at end of file

res/drawable/color_chip_hollow.xml

+24 −7
Original line number Diff line number Diff line
@@ -15,10 +15,27 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:height="@dimen/component_color_chip_size"

        android:width="@dimen/component_color_chip_size"

        android:gravity="center">

        <shape

            android:shape="oval">

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

        </shape>

    </item>

    <item

        android:height="@dimen/component_color_chip_container_size"

        android:width="@dimen/component_color_chip_container_size"

        android:gravity="center">

        <shape

            android:shape="ring"

        android:innerRadius="10dp"

        android:thickness="6dp"

            android:innerRadius="24dp"

            android:thickness="@dimen/option_border_width"

            android:useLevel="false">

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

        </shape>

    </item>

</layer-list>

res/drawable/option_border_edge_custom.xml

+1 −2
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@ 
    <item android:state_activated="false">

        <shape android:shape="rectangle">

            <stroke

                android:color="@color/black_24_alpha"

                android:alpha="0.24"

                android:color="@color/option_border_color"

                android:width="@dimen/option_border_width" />

            <corners android:radius="?android:dialogCornerRadius" />

        </shape>

res/layout/fragment_custom_theme_component.xml

+10 −21
Original line number Diff line number Diff line
@@ -33,13 +33,13 @@ 
            android:layout_height="0dp"

            android:background="?android:colorPrimary"

            app:layout_constrainedHeight="true"

            app:layout_constraintBottom_toTopOf="@+id/guideline"

            app:layout_constraintBottom_toTopOf="@+id/divider"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintHeight_max="@dimen/preview_pager_max_height"

            app:layout_constraintHorizontal_bias="0.5"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintTop_toTopOf="parent"

            app:layout_constraintVertical_bias="0.0">

            app:layout_constraintVertical_bias="0.0"

            app:layout_constraintHeight_percent="@dimen/preview_pager_maximum_height_ratio">



            <include

                android:id="@+id/component_preview_content"
@@ -50,6 +50,7 @@ 
                android:layout_marginHorizontal="@dimen/preview_page_horizontal_margin"

                android:layout_marginTop="@dimen/preview_page_top_margin"/>

        </FrameLayout>



        <View

            android:id="@+id/divider"

            android:layout_width="match_parent"
@@ -59,42 +60,30 @@ 
            app:layout_constraintStart_toStartOf="parent"

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

        

        <androidx.constraintlayout.widget.Guideline

            android:id="@+id/guideline"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            app:layout_constraintGuide_percent=".7"/>





        <TextView

            android:id="@+id/component_options_title"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="10dp"

            android:layout_marginStart="10dp"

            android:layout_marginEnd="10dp"

            android:layout_marginBottom="10dp"

            android:layout_marginVertical="18dp"

            android:layout_marginHorizontal="16dp"

            android:textAlignment="center"

            android:textAppearance="@style/TitleTextAppearance"

            android:textSize="@dimen/component_options_title_size"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintTop_toBottomOf="@+id/component_preview_container"

            app:layout_constraintBottom_toBottomOf="parent"

            app:layout_constraintVertical_bias=".15"/>

            app:layout_constraintBottom_toTopOf="@+id/options_container"/>



        <androidx.recyclerview.widget.RecyclerView

            android:id="@+id/options_container"

            android:layout_width="match_parent"

            android:layout_height="@dimen/options_container_height"

            android:layout_height="0dp"

            android:layout_gravity="center_horizontal"

            app:layout_constraintBottom_toBottomOf="parent"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintHorizontal_bias="0.5"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintTop_toBottomOf="@+id/component_options_title"

            app:layout_constraintVertical_bias=".25"/>

            app:layout_constraintVertical_bias="1"/>



    </androidx.constraintlayout.widget.ConstraintLayout>

</LinearLayout>

res/layout/fragment_custom_theme_name.xml

+24 −28
Original line number Diff line number Diff line
@@ -36,55 +36,51 @@ 
            android:clipToPadding="false"

            android:background="@color/fullscreen_preview_background"

            app:layout_constrainedHeight="true"

            app:layout_constraintBottom_toTopOf="@+id/guideline"

            app:layout_constraintBottom_toTopOf="@+id/component_options_title"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintHeight_max="@dimen/preview_pager_max_height"

            app:layout_constraintHorizontal_bias="0.5"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintTop_toTopOf="parent"

            app:layout_constraintVertical_bias="0.0">

            app:layout_constraintVertical_bias="0.0"

            app:layout_constraintHeight_percent="@dimen/preview_pager_maximum_height_ratio">



            <include layout="@layout/theme_preview_card"/>

        </FrameLayout>



        <androidx.constraintlayout.widget.Guideline

            android:id="@+id/guideline"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            app:layout_constraintGuide_percent=".7"/>



        <TextView

            android:id="@+id/component_options_title"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="10dp"

            android:layout_marginStart="10dp"

            android:layout_marginEnd="10dp"

            android:layout_marginBottom="10dp"

            android:layout_marginVertical="18dp"

            android:layout_marginHorizontal="16dp"

            android:textAlignment="center"

            android:textAppearance="@style/TitleTextAppearance"

            android:textSize="@dimen/component_options_title_size"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintTop_toBottomOf="@+id/component_preview_container"

            app:layout_constraintBottom_toTopOf="@+id/edit_text_container"/>



        <FrameLayout

            android:id="@+id/edit_text_container"

            android:layout_width="match_parent"

            android:layout_height="0dp"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintTop_toBottomOf="@+id/component_options_title"

            app:layout_constraintBottom_toBottomOf="parent"

            app:layout_constraintVertical_bias=".15"/>

            app:layout_constraintVertical_bias="1">



            <EditText

                android:id="@+id/custom_theme_name"

            style="@style/CustomThemeNameEditText"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginVertical="16dp"

                android:layout_marginHorizontal="16dp"

                android:layout_gravity="center|top"

                android:importantForAutofill="no"

                android:minWidth="300dp"

            app:layout_constraintBottom_toBottomOf="parent"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintHorizontal_bias="0.5"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintTop_toBottomOf="@+id/component_options_title"

            app:layout_constraintVertical_bias=".25"/>





                style="@style/CustomThemeNameEditText"/>

        </FrameLayout>

    </androidx.constraintlayout.widget.ConstraintLayout>



</LinearLayout>