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

Commit 5f3f0a2f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Enable new theme picker preveiw" into ub-launcher3-master

parents 5b0725c4 0ff710e9

res/layout-land/fragment_theme_picker.xml

+17 −28
Original line number Diff line number Diff line
@@ -31,39 +31,28 @@ 
            android:layout_height="match_parent"

            android:orientation="horizontal">



            <com.android.wallpaper.widget.PreviewPager

                android:id="@+id/theme_preview_pager"

                android:layout_width="0dp"

                android:layout_height="match_parent"

                android:layout_weight="1"

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

            <View

                android:layout_width="1dp"

                android:layout_height="match_parent"

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

            <LinearLayout

                android:id="@+id/options_section"

            <FrameLayout

                android:layout_width="0dp"

                android:layout_height="match_parent"

                android:layout_weight="1"

                android:paddingVertical="10dp"

                android:orientation="vertical">

                android:layout_weight="1">

                <FrameLayout

                    android:id="@+id/preview_card_container"

                    android:layout_width="match_parent"

                    android:layout_height="@dimen/preview_content_height"

                    android:paddingTop="@dimen/preview_content_padding_top"

                    android:paddingBottom="@dimen/preview_content_padding_bottom"

                    android:clipToPadding="false"

                    android:background="@color/fullscreen_preview_background">

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

                </FrameLayout>

            </FrameLayout>



            <androidx.recyclerview.widget.RecyclerView

                android:id="@+id/options_container"

                    android:layout_width="match_parent"

                    android:layout_height="0dp"

                    android:layout_weight="1"/>



                <Button

                    android:id="@+id/apply_button"

                    style="@style/ActionPrimaryButton"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_gravity="end"

                    android:paddingHorizontal="10dp"

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

            </LinearLayout>

                android:layout_width="0dp"

                android:layout_height="match_parent"

                android:layout_weight="1"

                android:paddingVertical="10dp" />

        </LinearLayout>



        <androidx.core.widget.ContentLoadingProgressBar

res/layout/fragment_theme_picker.xml

+1 −10
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
            android:layout_height="match_parent"

            android:orientation="vertical">



            <!-- The V2 preview card. -->

            <FrameLayout

                android:id="@+id/preview_card_container"

                android:layout_width="match_parent"
@@ -40,18 +39,10 @@ 
                android:paddingTop="@dimen/preview_content_padding_top"

                android:paddingBottom="@dimen/preview_content_padding_bottom"

                android:clipToPadding="false"

                android:background="@color/fullscreen_preview_background"

                android:visibility="gone">

                android:background="@color/fullscreen_preview_background">

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

            </FrameLayout>



            <!-- Will remove it later. -->

            <com.android.wallpaper.widget.PreviewPager

                android:id="@+id/theme_preview_pager"

                android:layout_width="match_parent"

                android:layout_height="@dimen/preview_content_height"

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



            <androidx.recyclerview.widget.RecyclerView

                android:id="@+id/options_container"

                android:layout_width="match_parent"

src/com/android/customization/picker/theme/ThemeFragment.java

+36 −355

File changed.

Preview size limit exceeded, changes collapsed.