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

Commit 56755cc3 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7280565 from b2998a29 to sc-v2-release 

Change-Id: I9f586b907145508215ef7e8fe1cb020fcdd2d6bb
parents 3adb011c b2998a29

res/layout/fragment_grid_picker.xml

+12 −32
Original line number Diff line number Diff line
@@ -34,47 +34,27 @@ 
            <FrameLayout

                android:id="@+id/preview_card_container"

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:paddingTop="@dimen/preview_content_padding_top"

                android:paddingBottom="@dimen/preview_content_padding_bottom"

                android:layout_height="wrap_content"

                android:clipToPadding="false"

                android:paddingTop="@dimen/preview_page_top_margin"

                android:paddingBottom="@dimen/preview_page_bottom_margin"

                app:layout_constrainedHeight="true"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintBottom_toTopOf="@+id/options_container"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintTop_toTopOf="parent"

                app:layout_constraintBottom_toTopOf="@id/options_title"

                app:layout_constraintHeight_max="@dimen/preview_pager_max_height"

                app:layout_constraintVertical_bias="0.0"

                app:layout_constraintHeight_percent="@dimen/preview_pager_maximum_height_ratio">

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintTop_toTopOf="parent">



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

            </FrameLayout>



            <TextView

                android:id="@+id/options_title"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:background="?android:colorPrimary"

                android:gravity="center"

                android:paddingVertical="18dp"

                android:lineHeight="24dp"

                android:singleLine="true"

                android:text="@string/grid_options_title"

                android:textAppearance="@style/TitleTextAppearance"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintTop_toBottomOf="@id/preview_card_container"

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



            <androidx.recyclerview.widget.RecyclerView

                android:id="@+id/options_container"

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:background="?android:colorPrimary"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintTop_toBottomOf="@id/options_title"

                android:layout_height="@dimen/options_container_height"



                app:layout_constraintBottom_toBottomOf="parent"

                app:layout_constraintVertical_bias="1.0" />

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintStart_toStartOf="parent" />

        </androidx.constraintlayout.widget.ConstraintLayout>



        <androidx.core.widget.ContentLoadingProgressBar

res/layout/fragment_theme_picker.xml

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ 
                android:layout_height="0dp"

                android:layout_gravity="bottom|center_horizontal"

                android:layout_marginTop="10dp"

                android:background="?android:colorPrimary"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintTop_toBottomOf="@+id/preview_card_container"

res/layout/grid_option.xml

+9 −7
Original line number Diff line number Diff line
@@ -23,13 +23,6 @@ 
    android:clipToPadding="false"

    android:orientation="vertical">



    <TextView

        android:id="@+id/option_label"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_horizontal"

        android:layout_marginBottom="@dimen/theme_option_label_margin"

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

    <FrameLayout

        android:id="@+id/option_tile"

        android:layout_width="@dimen/option_tile_width"
@@ -43,4 +36,13 @@ 
            android:layout_width="match_parent"

            android:layout_height="match_parent"/>

    </FrameLayout>



    <TextView

        android:id="@+id/option_label"

        android:layout_width="wrap_content"

        android:layout_height="24dp"

        android:layout_gravity="center_horizontal"

        android:layout_marginTop="@dimen/theme_option_label_margin"

        android:gravity="center"

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

</LinearLayout>

res/layout/grid_preview_card.xml

+1 −2
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@ 
    <ImageView

        android:id="@+id/wallpaper_preview_image"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

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

        android:layout_height="match_parent" />



    <SurfaceView

        android:id="@+id/wallpaper_preview_surface"

res/layout/theme_info_view.xml

+1 −3
Original line number Diff line number Diff line
@@ -20,9 +20,7 @@ 
    android:layout_height="wrap_content"

    android:gravity="center_horizontal"

    android:orientation="vertical"

    android:paddingHorizontal="@dimen/wallpaper_info_pane_horizontal_padding"

    android:paddingTop="@dimen/wallpaper_info_pane_top_padding"

    android:paddingBottom="@dimen/wallpaper_info_pane_bottom_padding"

    android:padding="@dimen/wallpaper_info_pane_padding"

    android:theme="@style/WallpaperPicker.BottomPaneStyle">



    <TextView