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

Commit 889619ea authored by Santiago Etchebehere's avatar Santiago Etchebehere
Browse files

Merging ub-launcher3-qt-r1-dev, build 5622904 

Test: Manual

Bug:130398264 P1 [a11y][Qt] Set Display size as Larger/Large, some of contents in Style preview get truncated.
Bug:130758661 P2 Book Cover thumnail : status bar icon : wifi/cellular/battery icon
Bug:130760023 P2 Replace maps to google app in shape cards
Bug:130763357 P2 Clock option> let's have a fixed height preview as Style and Grid
Bug:131296977 P2 Wallpaper preview is distorted in Style customization
Bug:132743160 P2 No Styles option in the setting of Styles and wallpapers
Bug:132808298 P2 Picker icons UI on preview for cover and color need to be all "turned on" and change the icon to flashlight
Bug:133326909 P2 Preview should handle hanging ContentProvider from launcher/sysui
Bug:133431281 P2 Wallpaper preview flickers when switching between styles
Bug:133438775 P2 Update the time in the theme cover status bar
Bug:133480934 P1 The explore button of current wallpaper was placed in a strange position.
Bug:133651908 P1 Clock face picker doesn't work
Bug:133793299 P2 Support customizing a Theme's LiveWallpaper when applying it
Bug:133903562 P2 Updates on Style
Bug:64712476 P3 Import translations for dev branches
Change-Id: I7080901c540534d51382cc421e148c7bfd75fdc0
parents 7a245c8e feb02d4b

res/layout/fragment_clock_picker.xml

+75 −26
Original line number Diff line number Diff line
@@ -23,40 +23,89 @@ 
    android:background="?android:colorPrimary">

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



    <com.android.customization.widget.PreviewPager

        android:id="@+id/clock_preview_pager"

    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1"

        android:background="@color/secondary_color"

        app:card_style="screen_aspect_ratio"/>

        android:layout_height="match_parent">



    <LinearLayout

        android:id="@+id/options_section"

        <androidx.constraintlayout.widget.ConstraintLayout

            android:id="@+id/content_section"

            android:layout_width="match_parent"

            android:layout_height="match_parent">



            <com.android.customization.widget.PreviewPager

                android:id="@+id/clock_preview_pager"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

        android:paddingVertical="10dp"

        android:orientation="vertical">

                android:background="@color/secondary_color"

                app:layout_constrainedHeight="true"

                app:layout_constraintBottom_toTopOf="@id/options_container"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintHeight_max="@dimen/preview_pager_max_height"

                app:layout_constraintHeight_min="@dimen/preview_pager_min_height"

                app:layout_constraintVertical_bias="0.0"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintTop_toTopOf="parent"

                app:layout_constraintVertical_chainStyle="spread_inside"/>



            <androidx.recyclerview.widget.RecyclerView

                android:id="@+id/options_container"

                android:layout_width="match_parent"

                android:layout_height="@dimen/options_container_height"

            android:layout_gravity="center_horizontal"/>

                android:layout_gravity="center_horizontal"

                android:layout_marginTop="10dp"

                app:layout_constraintBottom_toTopOf="@id/placeholder"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintTop_toBottomOf="@+id/clock_preview_pager"

                app:layout_constraintVertical_bias="1.0"/>



        <RelativeLayout

            <Space

                android:id="@+id/placeholder"

                android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingHorizontal="10dp">

                android:layout_height="@dimen/min_taptarget_height"

                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"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_alignParentEnd="true"

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

        </RelativeLayout>



    </LinearLayout>

                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

            android:id="@+id/loading_indicator"

            style="@android:style/Widget.DeviceDefault.ProgressBar"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="200dp"

            android:layout_gravity="center_horizontal|top"

            android:indeterminate="true"/>

        <FrameLayout

            android:id="@+id/error_section"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:visibility="gone">

            <TextView

                android:id="@+id/error_message"

                style="@style/HeaderTextAppearance"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_gravity="center"

                android:gravity="center"

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

        </FrameLayout>

    </FrameLayout>

</LinearLayout>

res/layout/fragment_custom_theme_component.xml

+59 −30
Original line number Diff line number Diff line
@@ -16,54 +16,83 @@ 
-->

<LinearLayout

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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:background="?android:colorPrimary">

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



    <androidx.constraintlayout.widget.ConstraintLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent">



        <FrameLayout

            android:id="@+id/component_preview_container"

            android:layout_width="match_parent"

            android:layout_height="0dp"

        android:layout_weight="1"

        android:background="?android:colorPrimary">

            android:background="?android:colorPrimary"

            app:layout_constrainedHeight="true"

            app:layout_constraintBottom_toTopOf="@+id/guideline"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintHeight_max="@dimen/preview_pager_max_height"

            app:layout_constraintHeight_min="@dimen/preview_pager_min_height"

            app:layout_constraintHorizontal_bias="0.5"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintTop_toTopOf="parent"

            app:layout_constraintVertical_bias="0.0">



            <include

                android:id="@+id/component_preview_content"

                layout="@layout/theme_component_preview"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_marginHorizontal="@dimen/preview_page_horizontal_margin"

                android:layout_marginTop="@dimen/preview_page_top_margin"

            android:layout_marginBottom="@dimen/component_preview_page_bottom_margin"

            layout="@layout/theme_component_preview"/>

                android:layout_marginBottom="@dimen/indicator_container_height"/>

        </FrameLayout>

        <View

            android:id="@+id/divider"

            android:layout_width="match_parent"

            android:layout_height="1dp"

        android:background="@color/divider_color"/>

    <LinearLayout

        android:id="@+id/options_section"

        android:layout_width="match_parent"

            android:background="@color/divider_color"

            app:layout_constraintEnd_toEndOf="parent"

            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:paddingVertical="10dp"

        android:clipToPadding="false"

        android:orientation="vertical">

            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_gravity="center"

            android:layout_margin="10dp"

            android:layout_marginTop="10dp"

            android:layout_marginStart="10dp"

            android:layout_marginEnd="10dp"

            android:layout_marginBottom="10dp"

            android:textAlignment="center"

            android:textAppearance="@style/HeaderTextAppearance"/>

            android:textAppearance="@style/HeaderTextAppearance"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintStart_toStartOf="parent"

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



        <androidx.recyclerview.widget.RecyclerView

            android:id="@+id/options_container"

            android:layout_width="match_parent"

            android:layout_height="@dimen/options_container_height"

            android:layout_gravity="center_horizontal"/>



    </LinearLayout>

            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=".2"/>



    </androidx.constraintlayout.widget.ConstraintLayout>

</LinearLayout>

res/layout/fragment_custom_theme_name.xml

+56 −37
Original line number Diff line number Diff line
@@ -16,59 +16,78 @@ 
-->

<LinearLayout

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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

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

    android:orientation="vertical"

    android:background="?android:colorPrimary">

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



    <androidx.constraintlayout.widget.ConstraintLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent">



        <FrameLayout

            android:id="@+id/component_preview_container"

            android:layout_width="match_parent"

            android:layout_height="0dp"

        android:layout_weight="1"

        android:background="@color/secondary_color">

            android:background="@color/secondary_color"

            app:layout_constrainedHeight="true"

            app:layout_constraintBottom_toTopOf="@+id/guideline"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintHeight_max="@dimen/preview_pager_max_height"

            app:layout_constraintHeight_min="@dimen/preview_pager_min_height"

            app:layout_constraintHorizontal_bias="0.5"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintTop_toTopOf="parent"

            app:layout_constraintVertical_bias="0.0">



            <include

                android:id="@+id/component_preview_content"

                layout="@layout/theme_preview_card"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_marginHorizontal="@dimen/preview_page_horizontal_margin"

                android:layout_marginTop="@dimen/preview_page_top_margin"

            android:layout_marginBottom="@dimen/component_preview_page_bottom_margin"

            layout="@layout/theme_preview_card"/>

                android:layout_marginBottom="@dimen/indicator_container_height"/>

        </FrameLayout>

    <LinearLayout

        android:id="@+id/options_section"

        android:layout_width="match_parent"



        <androidx.constraintlayout.widget.Guideline

            android:id="@+id/guideline"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

        android:paddingVertical="10dp"

        android:clipToPadding="false"

        android:orientation="vertical">

            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_gravity="center"

            android:layout_margin="10dp"

            android:layout_marginTop="10dp"

            android:layout_marginStart="10dp"

            android:layout_marginEnd="10dp"

            android:layout_marginBottom="10dp"

            android:textAlignment="center"

            android:textAppearance="@style/HeaderTextAppearance"/>



        <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="@dimen/options_container_height"

            android:layout_gravity="center">

            android:textAppearance="@style/HeaderTextAppearance"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintStart_toStartOf="parent"

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



        <EditText

                style="@style/CustomThemeNameEditText"

            android:id="@+id/custom_theme_name"

            style="@style/CustomThemeNameEditText"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

                android:layout_gravity="center"

                android:minWidth="300dp"/>

        </FrameLayout>

            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=".2"/>



    </LinearLayout>



    </androidx.constraintlayout.widget.ConstraintLayout>



</LinearLayout>

res/layout/fragment_grid_picker.xml

+75 −26
Original line number Diff line number Diff line
@@ -16,46 +16,95 @@ 
-->

<LinearLayout

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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:background="?android:colorPrimary">

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



    <com.android.customization.widget.PreviewPager

        android:id="@+id/grid_preview_pager"

    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1"

        android:background="@color/secondary_color"

        app:card_style="screen_aspect_ratio"/>

        android:layout_height="match_parent">



    <LinearLayout

        android:id="@+id/options_section"

        <androidx.constraintlayout.widget.ConstraintLayout

            android:id="@+id/content_section"

            android:layout_width="match_parent"

            android:layout_height="match_parent">



            <com.android.customization.widget.PreviewPager

                android:id="@+id/grid_preview_pager"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

        android:paddingVertical="10dp"

        android:orientation="vertical">

                android:background="@color/secondary_color"

                app:card_style="screen_aspect_ratio"

                app:layout_constrainedHeight="true"

                app:layout_constraintBottom_toTopOf="@id/options_container"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintHeight_max="@dimen/preview_pager_max_height"

                app:layout_constraintHeight_min="@dimen/preview_pager_min_height"

                app:layout_constraintVertical_bias="0.0"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintTop_toTopOf="parent"

                app:layout_constraintVertical_chainStyle="spread_inside"/>



            <androidx.recyclerview.widget.RecyclerView

                android:id="@+id/options_container"

                android:layout_width="match_parent"

                android:layout_height="@dimen/options_container_height"

            android:layout_gravity="center_horizontal"/>

                android:layout_gravity="center_horizontal"

                android:layout_marginTop="10dp"

                app:layout_constraintBottom_toTopOf="@id/placeholder"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintTop_toBottomOf="@+id/grid_preview_pager"

                app:layout_constraintVertical_bias="1.0"/>



        <RelativeLayout

            <Space

                android:id="@+id/placeholder"

                android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingHorizontal="10dp">

                android:layout_height="@dimen/min_taptarget_height"

                app:layout_constraintBottom_toTopOf="@id/apply_button"

                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_alignParentEnd="true"

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

        </RelativeLayout>

                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"/>



    </LinearLayout>

        </androidx.constraintlayout.widget.ConstraintLayout>



        <androidx.core.widget.ContentLoadingProgressBar

            android:id="@+id/loading_indicator"

            style="@android:style/Widget.DeviceDefault.ProgressBar"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="200dp"

            android:layout_gravity="center_horizontal|top"

            android:indeterminate="true"/>

        <FrameLayout

            android:id="@+id/error_section"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:visibility="gone">

            <TextView

                android:id="@+id/error_message"

                style="@style/HeaderTextAppearance"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_gravity="center"

                android:gravity="center"

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

        </FrameLayout>

    </FrameLayout>

</LinearLayout>

res/layout/fragment_theme_picker.xml

+76 −30

File changed.

Preview size limit exceeded, changes collapsed.