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

Commit 16c2eb2d authored by chihhangchuang's avatar chihhangchuang
Browse files

Cleanup for theme picker 

- Remove the ThemePreviewPage and related layout/dimens.
- Remove the v2 suffix, they are the v1 now.

Test: Build and run successfully
Bug: 151285476
Change-Id: Ie79b8676c3f28cbec77c04db65c16445276a3345
parent 079839f5

res/layout-land/fragment_custom_theme_name.xml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
            android:paddingBottom="@dimen/preview_content_padding_bottom"

            android:clipToPadding="false"

            android:background="@color/fullscreen_preview_background">

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

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

        </FrameLayout>

        <LinearLayout

            android:id="@+id/options_section"

res/layout-land/fragment_theme_picker.xml

+2 −2
Original line number Diff line number Diff line
@@ -38,12 +38,12 @@ 
                <FrameLayout

                    android:id="@+id/preview_card_container"

                    android:layout_width="match_parent"

                    android:layout_height="@dimen/preview_content_height"

                    android:layout_height="wrap_content"

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

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

                </FrameLayout>

            </FrameLayout>

res/layout/fragment_custom_theme_name.xml

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintTop_toTopOf="parent"

            app:layout_constraintVertical_bias="0.0">

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

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

        </FrameLayout>



        <androidx.constraintlayout.widget.Guideline

res/layout/fragment_theme_full_preview.xml

+1 −1
Original line number Diff line number Diff line
@@ -31,6 +31,6 @@ 
        android:clipToPadding="false"

        android:background="@color/fullscreen_preview_background">



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

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

    </FrameLayout>

</LinearLayout>
 
 No newline at end of file

res/layout/fragment_theme_picker.xml

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
                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">

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

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

            </FrameLayout>



            <androidx.recyclerview.widget.RecyclerView