Merging from ub-launcher3-master @ build 6538369 am: 741fbf67bc (e8a6bb07) · Commits · e / os / android_packages_apps_ThemePicker

res/layout-land/fragment_custom_theme_name.xml

+5 −9

Original line number	Diff line number	Diff line
		@@ -31,15 +31,11 @@
		android:layout_width="0dp"
		android:layout_height="match_parent"
		android:layout_weight="1"
		android:background="@color/secondary_color">
		<include
		android:id="@+id/component_preview_content"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_marginHorizontal="@dimen/preview_page_horizontal_margin"
		android:layout_marginTop="@dimen/preview_page_top_margin"
		android:layout_marginBottom="@dimen/component_preview_page_bottom_margin"
		layout="@layout/theme_preview_card"/>
		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"/>
		</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

+5 −10

Original line number	Diff line number	Diff line
		@@ -31,7 +31,10 @@
		android:id="@+id/component_preview_container"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:background="@color/secondary_color"
		android:paddingTop="@dimen/preview_content_padding_top"
		android:paddingBottom="@dimen/preview_content_padding_bottom"
		android:clipToPadding="false"
		android:background="@color/fullscreen_preview_background"
		app:layout_constrainedHeight="true"
		app:layout_constraintBottom_toTopOf="@+id/guideline"
		app:layout_constraintEnd_toEndOf="parent"
		@@ -40,15 +43,7 @@
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintVertical_bias="0.0">

		<include
		android:id="@+id/component_preview_content"
		layout="@layout/theme_preview_card"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_marginHorizontal="@dimen/preview_page_horizontal_margin"
		android:layout_marginTop="@dimen/preview_page_top_margin"
		android:layout_marginBottom="@dimen/indicator_container_height"/>
		<include layout="@layout/theme_preview_card"/>
		</FrameLayout>

		<androidx.constraintlayout.widget.Guideline

res/layout/fragment_grid_picker.xml

+26 −9

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		-->
		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical"
		@@ -26,19 +27,27 @@
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		<LinearLayout
		<androidx.constraintlayout.widget.ConstraintLayout
		android:id="@+id/content_section"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">
		android:layout_height="match_parent">

		<FrameLayout
		android:id="@+id/preview_card_container"
		android:layout_width="match_parent"
		android:layout_height="@dimen/preview_content_height"
		android:layout_height="0dp"
		android:paddingTop="@dimen/preview_content_padding_top"
		android:paddingBottom="@dimen/preview_content_padding_bottom"
		android:background="@color/fullscreen_preview_background"
		android:clipToPadding="false"
		android:background="@color/fullscreen_preview_background">
		app:layout_constrainedHeight="true"
		app:layout_constraintStart_toStartOf="parent"
		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">
		<include layout="@layout/grid_preview_card"/>
		</FrameLayout>

		@@ -51,14 +60,22 @@
		android:lineHeight="24dp"
		android:singleLine="true"
		android:text="@string/grid_options_title"
		android:textAppearance="@style/TitleTextAppearance"/>
		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="wrap_content"
		android:layout_gravity="center_horizontal"/>
		</LinearLayout>
		android:layout_height="0dp"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintTop_toBottomOf="@id/options_title"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintVertical_bias="1.0" />
		</androidx.constraintlayout.widget.ConstraintLayout>

		<androidx.core.widget.ContentLoadingProgressBar
		android:id="@+id/loading_indicator"

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