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

Commit 920016a3 authored by Winson Chung's avatar Winson Chung
Browse files

Merging from ub-launcher3-master @ build 6075050 

Test: manual, presubmit on the source branch
http://x20/teams/android-launcher/merge/ub-launcher3-master_6075050.html

Change-Id: I1c23fceeb7d497b0f4f7174356b9f482a9fa5d2c
parents 4f822017 58e1b52d

res/layout-land/fragment_clock_picker.xml

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ 
            android:visibility="gone">

            <TextView

                android:id="@+id/error_message"

                style="@style/HeaderTextAppearance"

                style="@style/TitleTextAppearance"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_gravity="center"

res/layout-land/fragment_custom_theme_component.xml

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
                android:layout_gravity="center"

                android:layout_margin="10dp"

                android:textAlignment="center"

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

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



            <androidx.recyclerview.widget.RecyclerView

                android:id="@+id/options_container"

res/layout-land/fragment_custom_theme_name.xml

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
                android:layout_gravity="center"

                android:layout_margin="10dp"

                android:textAlignment="center"

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

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



            <FrameLayout

                android:layout_width="match_parent"

res/layout-land/fragment_grid_picker.xml

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ 
            android:visibility="gone">

            <TextView

                android:id="@+id/error_message"

                style="@style/HeaderTextAppearance"

                style="@style/TitleTextAppearance"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_gravity="center"

res/layout-land/fragment_theme_picker.xml

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ 
            android:visibility="gone">

            <TextView

                android:id="@+id/error_message"

                style="@style/HeaderTextAppearance"

                style="@style/TitleTextAppearance"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_gravity="center"