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

Commit 225204bc authored by Joshua Trask's avatar Joshua Trask
Browse files

Merging from ub-launcher3-master @ build 6519151 

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

Change-Id: I3b0891cd7ab31f39844a843818dade3709cd4437
parents b2c43c5c 20fb9b61

res/drawable/option_border_custom.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    <item android:id="@android:id/mask">

        <shape android:shape="rectangle">

            <solid android:color="@android:color/white"/>

            <corners android:radius="4dp" />

            <corners android:radius="?android:dialogCornerRadius" />

        </shape>

    </item>

    <item android:drawable="@drawable/option_border_edge_custom" />

res/drawable/option_border_edge_custom.xml

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
            <stroke

                android:color="@color/option_border_color"

                android:width="@dimen/option_selected_border_width" />

            <corners android:radius="4dp" />

            <corners android:radius="?android:dialogCornerRadius" />

        </shape>

    </item>

    <item android:state_activated="false">
@@ -29,7 +29,7 @@ 
                android:color="@color/black_24_alpha"

                android:alpha="0.24"

                android:width="@dimen/option_border_width" />

            <corners android:radius="4dp" />

            <corners android:radius="?android:dialogCornerRadius" />

        </shape>

    </item>

</selector>

res/layout-land/fragment_grid_picker.xml

+7 −4
Original line number Diff line number Diff line
@@ -31,13 +31,16 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="horizontal">

        <com.android.wallpaper.widget.PreviewPager

            android:id="@+id/grid_preview_pager"

        <FrameLayout

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:background="@color/secondary_color"

            app:card_style="screen_aspect_ratio"/>

            android:clipToPadding="false"

            android:paddingTop="@dimen/preview_content_padding_top"

            android:paddingBottom="@dimen/preview_content_padding_bottom"

            android:background="@color/fullscreen_preview_background">

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

        </FrameLayout>



        <FrameLayout

            android:id="@+id/options_section"

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/activity_custom_theme.xml

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ 
        android:id="@+id/custom_theme_nav"

        android:layout_width="match_parent"

        android:layout_height="@dimen/custom_theme_nav_height"

        android:layout_marginHorizontal="12dp">

        android:paddingHorizontal="12dp"

        android:background="?android:colorPrimary">

        <Button

            android:id="@+id/previous_button"

            style="@style/ActionSecondaryButton"