Merge "Landscape support 2/n" into ub-launcher3-qt-dev (74e2286b) · Commits · e / os / android_packages_apps_ThemePicker

res/layout-land/fragment_custom_theme_component.xml

0 → 100644

+71 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2019 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical"
		android:background="?android:colorPrimary">
		<include layout="@layout/section_header"/>

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="horizontal">

		<FrameLayout
		android:id="@+id/component_preview_container"
		android:layout_width="0dp"
		android:layout_height="match_parent"
		android:layout_weight="1"
		android:background="@color/secondary_color">
		<include
		android:id="@+id/component_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/component_preview_page_bottom_margin"
		layout="@layout/theme_preview_card"/>
		</FrameLayout>

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

		<TextView
		android:id="@+id/component_options_title"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:layout_margin="10dp"
		android:textAlignment="center"
		android:textAppearance="@style/HeaderTextAppearance"/>

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

		</LinearLayout>
		</LinearLayout>
		</LinearLayout>

res/layout/theme_font_option.xml

+1 −1

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

		<TextView

src/com/android/customization/widget/OptionSelectorController.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -73,15 +73,14 @@ public class OptionSelectorController<T extends CustomizationOption<T>> {
		private CustomizationOption mAppliedOption;

		public OptionSelectorController(RecyclerView container, List<T> options) {
		this(container, options, container.getResources().getBoolean(R.bool.use_grid_for_options),
		true);
		this(container, options, false, true);
		}

		public OptionSelectorController(RecyclerView container, List<T> options,
		boolean useGrid, boolean showCheckmark) {
		mContainer = container;
		mOptions = options;
		mUseGrid = useGrid;
		mUseGrid = container.getResources().getBoolean(R.bool.use_grid_for_options) \|\| useGrid;
		mShowCheckmark = showCheckmark;
		}