Merge "Update Grid page to new design (Except preview part)" into ub-launcher3-master (586de947) · Commits · e / os / android_packages_apps_ThemePicker

res/layout-land/fragment_grid_picker.xml

+4 −20

Original line number	Diff line number	Diff line
		@@ -39,34 +39,18 @@
		android:background="@color/secondary_color"
		app:card_style="screen_aspect_ratio"/>

		<LinearLayout
		<FrameLayout
		android:id="@+id/options_section"
		android:layout_width="0dp"
		android:layout_height="match_parent"
		android:layout_weight="1"
		android:paddingVertical="10dp"
		android:orientation="vertical">
		android:paddingVertical="10dp">

		<androidx.recyclerview.widget.RecyclerView
		android:id="@+id/options_container"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1"/>

		<RelativeLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingHorizontal="10dp">
		<Button
		android:id="@+id/apply_button"
		style="@style/ActionPrimaryButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignParentEnd="true"
		android:text="@string/apply_btn"/>
		</RelativeLayout>

		</LinearLayout>
		android:layout_height="match_parent"/>
		</FrameLayout>
		</LinearLayout>
		<androidx.core.widget.ContentLoadingProgressBar
		android:id="@+id/loading_indicator"

res/layout/fragment_grid_picker.xml

+20 −17

Original line number	Diff line number	Diff line
		@@ -39,36 +39,39 @@
		android:background="@color/preview_pager_background"
		app:card_style="screen_aspect_ratio"
		app:layout_constrainedHeight="true"
		app:layout_constraintBottom_toTopOf="@id/options_container"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toTopOf="@id/options_title"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintHeight_max="@dimen/preview_pager_max_height"
		app:layout_constraintHeight_min="@dimen/preview_pager_min_height"
		app:layout_constraintVertical_bias="0.0"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintVertical_chainStyle="spread_inside"/>

		<TextView
		android:id="@+id/options_title"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:gravity="center"
		android:paddingVertical="18dp"
		android:lineHeight="24dp"
		android:singleLine="true"
		android:text="@string/grid_options_title"
		android:textAppearance="@style/TitleTextAppearance"
		app:layout_constraintTop_toBottomOf="@id/grid_preview_pager"
		app:layout_constraintBottom_toTopOf="@id/options_container"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintEnd_toEndOf="parent"/>

		<androidx.recyclerview.widget.RecyclerView
		android:id="@+id/options_container"
		android:layout_width="match_parent"
		android:layout_height="@dimen/options_container_height"
		android:layout_gravity="center_horizontal"
		android:layout_marginTop="10dp"
		app:layout_constraintBottom_toTopOf="@id/placeholder"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintTop_toBottomOf="@+id/options_title"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintTop_toBottomOf="@+id/grid_preview_pager"
		app:layout_constraintVertical_bias="1.0"/>

		<Space
		android:id="@+id/placeholder"
		android:layout_width="match_parent"
		android:layout_height="@dimen/min_taptarget_height"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintTop_toBottomOf="@id/options_container"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintVertical_bias="1.0"/>

		</androidx.constraintlayout.widget.ConstraintLayout>

		<androidx.core.widget.ContentLoadingProgressBar

res/layout/fragment_grid_scalable_picker.xml

+16 −33

Original line number	Diff line number	Diff line
		@@ -44,46 +44,29 @@
		app:behavior_peekHeight="@dimen/content_container_minimum_height"
		app:layout_behavior="@string/bottom_sheet_behavior">

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

		<TextView
		android:id="@+id/options_title"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:gravity="center"
		android:paddingVertical="18dp"
		android:lineHeight="24dp"
		android:singleLine="true"
		android:text="@string/grid_options_title"
		android:textAppearance="@style/TitleTextAppearance"/>

		<androidx.recyclerview.widget.RecyclerView
		android:id="@+id/options_container"
		android:layout_width="match_parent"
		android:layout_height="@dimen/options_container_height"
		android:layout_gravity="center_horizontal"
		android:layout_marginTop="10dp"
		app:layout_constraintBottom_toTopOf="@id/placeholder"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintVertical_bias="1.0" />

		<Space
		android:id="@+id/placeholder"
		android:layout_width="match_parent"
		android:layout_height="@dimen/min_taptarget_height"
		app:layout_constraintBottom_toTopOf="@id/apply_button"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintTop_toBottomOf="@id/options_container"
		app:layout_constraintVertical_bias="1.0" />

		<Button
		android:id="@+id/apply_button"
		style="@style/ActionPrimaryButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="end"
		android:layout_marginVertical="10dp"
		android:layout_marginEnd="10dp"
		android:layout_weight="1"
		android:text="@string/apply_theme_btn"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toEndOf="parent" />

		</androidx.constraintlayout.widget.ConstraintLayout>
		android:layout_gravity="center_horizontal"/>
		</LinearLayout>
		</FrameLayout>

		<FrameLayout

res/values/dimens.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -27,9 +27,9 @@
		<dimen name="component_preview_page_bottom_margin">16dp</dimen>

		<!-- Dimensions for the customization option tiles -->
		<dimen name="options_container_height">104dp</dimen>
		<dimen name="options_container_height">120dp</dimen>
		<dimen name="options_container_width">0dp</dimen>
		<dimen name="option_tile_width">72dp</dimen>
		<dimen name="option_tile_width">88dp</dimen>
		<dimen name="theme_option_icon_sample_height">18dp</dimen>
		<dimen name="theme_option_icon_sample_width">18dp</dimen>
		<dimen name="theme_option_shape_sample_height">16dp</dimen>

res/values/strings.xml

+4 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@

		<!-- Plus sign used to indicate that the user can add a custom theme -->

		<!-- Name for the Android Theme that comes preset with the device [CHAR LIMIT=10]-->
		<!-- Name for the Android Theme (Style/Wallpaper/Grid/Clock...) that comes preset with the device [CHAR LIMIT=10]-->
		<string name="default_theme_title">Default</string>

		<!-- Title of a page that shows the user the preview of a font selection [CHAR_LIMIT=20] -->
		@@ -92,6 +92,9 @@
		<!-- Body text for previewing a font [CHAR LIMIT=160] -->
		<string name="font_card_body">Add your favorite fonts to every screen</string>

		<!--Title for grid options [CHAR LIMIT=NONE] -->
		<string name="grid_options_title">Choose a grid size</string>

		<!--Title for a grid option, describing the number of columns and rows, eg: 4x4 [CHAR LIMIT=10] -->
		<string name="grid_title_pattern"><xliff:g name="num_cols" example="1">%1$d</xliff:g>x<xliff:g name="num_rows" example="1">%2$d</xliff:g></string>