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

Commit 8a3847e7 authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

Merging from ub-launcher3-master @ build 6408463 

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

Change-Id: I94008fb8291d8db6126b36ff45aa15ca8ffa8c2f
parents d1f865b1 bed0008d

res/layout-land/fragment_theme_picker.xml

+7 −23
Original line number Diff line number Diff line
@@ -55,30 +55,14 @@ 
                    android:layout_height="0dp"

                    android:layout_weight="1"/>



                <RelativeLayout

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:background="@null"

                    android:paddingHorizontal="10dp">

                    <CheckBox

                        android:id="@+id/use_my_wallpaper"

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:layout_alignParentStart="true"

                        android:layout_centerVertical="true"

                        android:layout_toStartOf="@+id/apply_button"

                        android:ellipsize="end"

                        android:paddingLeft="4dp"

                        android:minHeight="@dimen/min_taptarget_height"

                        android:text="@string/keep_my_wallpaper"/>

                <Button

                    android:id="@+id/apply_button"

                    style="@style/ActionPrimaryButton"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                        android:layout_alignParentEnd="true"

                    android:layout_gravity="end"

                    android:paddingHorizontal="10dp"

                    android:text="@string/apply_theme_btn"/>

                </RelativeLayout>

            </LinearLayout>

        </LinearLayout>

res/layout/fragment_grid_picker.xml

+1 −14
Original line number Diff line number Diff line
@@ -64,24 +64,11 @@ 
                android:id="@+id/placeholder"

                android:layout_width="match_parent"

                android:layout_height="@dimen/min_taptarget_height"

                app:layout_constraintBottom_toTopOf="@id/apply_button"

                app:layout_constraintBottom_toBottomOf="parent"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintTop_toBottomOf="@id/options_container"

                app:layout_constraintVertical_bias="1.0"/>



            <Button

                android:id="@+id/apply_button"

                style="@style/ActionPrimaryButton"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="end"

                android:layout_marginEnd="10dp"

                android:layout_marginVertical="10dp"

                android:layout_weight="1"

                android:text="@string/apply_theme_btn"

                app:layout_constraintBottom_toBottomOf="parent"

                app:layout_constraintEnd_toEndOf="parent"/>



        </androidx.constraintlayout.widget.ConstraintLayout>



        <androidx.core.widget.ContentLoadingProgressBar

res/layout/fragment_theme_picker.xml

+0 −18
Original line number Diff line number Diff line
@@ -53,29 +53,11 @@ 
                android:layout_gravity="bottom|center_horizontal"

                android:layout_marginTop="10dp"

                android:layout_weight="1"

                app:layout_constraintBottom_toTopOf="@id/use_my_wallpaper"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintTop_toBottomOf="@+id/theme_preview_pager"

                app:layout_constraintVertical_bias="1.0"/>



            <CheckBox

                android:id="@+id/use_my_wallpaper"

                android:layout_width="wrap_content"

                android:layout_height="@dimen/min_taptarget_height"

                android:layout_marginStart="10dp"

                android:ellipsize="end"

                android:gravity="start|center_vertical"

                android:paddingLeft="4dp"

                android:text="@string/keep_my_wallpaper"

                app:layout_constraintBottom_toTopOf="@id/apply_button"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintHeight_min="@dimen/min_taptarget_height"

                app:layout_constraintHorizontal_bias="0.0"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintTop_toBottomOf="@id/options_container"

                app:layout_constraintVertical_bias="1.0"/>



            <Button

                android:id="@+id/apply_button"

                style="@style/ActionPrimaryButton"

res/layout/fragment_theme_scalable_picker.xml

+0 −18
Original line number Diff line number Diff line
@@ -55,29 +55,11 @@ 
                android:layout_gravity="bottom|center_horizontal"

                android:layout_marginTop="10dp"

                android:layout_weight="1"

                app:layout_constraintBottom_toTopOf="@id/use_my_wallpaper"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintTop_toTopOf="parent"

                app:layout_constraintVertical_bias="1.0" />



            <CheckBox

                android:id="@+id/use_my_wallpaper"

                android:layout_width="wrap_content"

                android:layout_height="@dimen/min_taptarget_height"

                android:layout_marginStart="10dp"

                android:ellipsize="end"

                android:gravity="start|center_vertical"

                android:paddingLeft="4dp"

                android:text="@string/keep_my_wallpaper"

                app:layout_constraintBottom_toTopOf="@id/apply_button"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintHeight_min="@dimen/min_taptarget_height"

                app:layout_constraintHorizontal_bias="0.0"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintTop_toBottomOf="@id/options_container"

                app:layout_constraintVertical_bias="1.0" />



            <Button

                android:id="@+id/apply_button"

                style="@style/ActionPrimaryButton"

res/layout/preview_card_wallpaper_content.xml

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2019 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<FrameLayout

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

    xmlns:tools="http://schemas.android.com/tools"

    android:id="@+id/preview_static_image"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_gravity="bottom"

    tools:showIn="@layout/theme_preview_card">

    <TextView

        style="@style/CardTitleTextAppearance"

        android:id="@+id/wallpaper_description"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="center_horizontal|bottom"/>

</FrameLayout>
 
 No newline at end of file