Merge "[XPD] Support Preference style injection" into main (83b7c110) · Commits · e / os / android_frameworks_base

packages/SettingsLib/SelectorWithWidgetPreference/res/layout-v36/settingslib_preference_selector_with_widget.xml

+12 −60

Original line number	Diff line number	Diff line
		@@ -19,91 +19,43 @@
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:background="?android:attr/selectableItemBackground"
		android:gravity="center_vertical"
		android:minHeight="?android:attr/listPreferredItemHeightSmall"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
		android:theme="?expressiveSelectorWithWidgetPreferenceTheme"
		style="?expressiveSelectorWithWidgetPreferenceRootLayoutStyle">

		<LinearLayout
		android:id="@android:id/widget_frame"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:gravity="center"
		android:minWidth="@dimen/settingslib_expressive_space_medium3"
		android:minHeight="@dimen/settingslib_expressive_space_medium3"
		android:layout_marginEnd="@dimen/settingslib_expressive_space_extrasmall6"
		android:orientation="vertical"/>
		style="?expressiveSelectorWithWidgetPreferenceWidgetFrameStyle" />

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

		<LinearLayout
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:orientation="vertical"
		android:paddingTop="@dimen/settingslib_expressive_space_small1"
		android:paddingBottom="@dimen/settingslib_expressive_space_small1"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
		<LinearLayout style="?expressiveSelectorWithWidgetPreferenceTextContainerStyle">

		<TextView
		android:id="@android:id/title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:maxLines="2"
		android:ellipsize="end"
		android:hyphenationFrequency="normalFast"
		android:lineBreakWordStyle="phrase"
		android:textAppearance="?android:attr/textAppearanceListItem"/>
		style="?expressiveSelectorWithWidgetPreferenceTitleStyle" />

		<LinearLayout
		android:id="@+id/summary_container"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:visibility="gone">
		style="?expressiveSelectorWithWidgetPreferenceSummaryContainerStyle">

		<TextView
		android:id="@android:id/summary"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textAlignment="viewStart"
		android:hyphenationFrequency="normalFast"
		android:lineBreakWordStyle="phrase"
		android:textColor="?android:attr/textColorSecondary"/>
		style="?expressiveSelectorWithWidgetPreferenceSummaryStyle" />

		<TextView
		android:id="@+id/appendix"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textAlignment="viewEnd"
		android:textColor="?android:attr/textColorSecondary"
		android:maxLines="1"
		android:visibility="gone"
		android:ellipsize="end"/>
		style="?expressiveSelectorWithWidgetPreferenceAppendixStyle" />
		</LinearLayout>
		</LinearLayout>

		<LinearLayout
		android:id="@+id/selector_extra_widget_container"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:orientation="horizontal"
		android:gravity="center_vertical">
		style="?expressiveSelectorWithWidgetPreferenceExtraWidgetContainerStyle">

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

		<ImageView
		android:id="@+id/selector_extra_widget"
		android:layout_width="match_parent"
		android:minWidth="@dimen/settingslib_expressive_space_medium4"
		android:layout_height="fill_parent"
		android:src="@drawable/ic_settings_accent"
		android:scaleType="centerInside"
		android:contentDescription="@string/settings_label"
		android:layout_gravity="center"
		android:background="?android:attr/selectableItemBackground"/>
		style="?expressiveSelectorWithWidgetPreferenceExtraWidgetImageStyle" />
		</LinearLayout>
		</LinearLayout>

packages/SettingsLib/SelectorWithWidgetPreference/res/values-v36/styles_preference_expressive.xml

0 → 100644

+141 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2025 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.
		-->
		<resources>
		<style name="ThemeOverlay.ExpressiveSelectorWithWidgetPreference" parent="">
		<item name="expressiveSelectorWithWidgetPreferenceTheme">@style/ExpressiveSelectorWithWidgetPreferenceTheme</item>
		</style>

		<style name="ExpressiveSelectorWithWidgetPreferenceTheme">
		<item name="expressiveSelectorWithWidgetPreferenceRootLayoutStyle">@style/ExpressiveSelectorWithWidgetPreferenceRootLayoutStyle</item>
		<item name="expressiveSelectorWithWidgetPreferenceWidgetFrameStyle">@style/ExpressiveSelectorWithWidgetPreferenceWidgetFrameStyle</item>
		<item name="expressiveSelectorWithWidgetPreferenceIconStyle">@style/ExpressiveSelectorWithWidgetPreferenceIconStyle</item>
		<item name="expressiveSelectorWithWidgetPreferenceTextContainerStyle">@style/ExpressiveSelectorWithWidgetPreferenceTextContainerStyle</item>
		<item name="expressiveSelectorWithWidgetPreferenceTitleStyle">@style/ExpressiveSelectorWithWidgetPreferenceTitleStyle</item>
		<item name="expressiveSelectorWithWidgetPreferenceSummaryContainerStyle">@style/ExpressiveSelectorWithWidgetPreferenceSummaryContainerStyle</item>
		<item name="expressiveSelectorWithWidgetPreferenceSummaryStyle">@style/ExpressiveSelectorWithWidgetPreferenceSummaryStyle</item>
		<item name="expressiveSelectorWithWidgetPreferenceAppendixStyle">@style/ExpressiveSelectorWithWidgetPreferenceAppendixStyle</item>
		<item name="expressiveSelectorWithWidgetPreferenceExtraWidgetContainerStyle">@style/ExpressiveSelectorWithWidgetPreferenceExtraWidgetContainerStyle</item>
		<item name="expressiveSelectorWithWidgetPreferenceExtraWidgetDividerStyle">@style/ExpressiveSelectorWithWidgetPreferenceExtraWidgetDividerStyle</item>
		<item name="expressiveSelectorWithWidgetPreferenceExtraWidgetImageStyle">@style/ExpressiveSelectorWithWidgetPreferenceExtraWidgetImageStyle</item>
		<!-- We need these because layout-v36/settingslib_preference_selector_with_widget.xml may be used in non-expressive theme. -->
		<item name="expressivePreferenceIconFrameStyle">@style/ExpressivePreferenceIconFrameStyle</item>
		<item name="expressivePreferenceIconStyle">@style/ExpressivePreferenceIconStyle</item>
		<item name="expressiveTwoTargetDividerStyle">@style/ExpressiveTwoTargetDividerStyle</item>
		<item name="expressiveTwoTargetDividerImageViewStyle">@style/ExpressiveTwoTargetDividerImageViewStyle</item>
		<item name="expressiveTwoTargetDividerViewStyle">@style/ExpressiveTwoTargetDividerViewStyle</item>
		</style>

		<style name="ExpressiveSelectorWithWidgetPreferenceRootLayoutStyle">
		<item name="android:background">?android:attr/selectableItemBackground</item>
		<item name="android:gravity">center_vertical</item>
		<item name="android:minHeight">?android:attr/listPreferredItemHeightSmall</item>
		<item name="android:paddingStart">?android:attr/listPreferredItemPaddingStart</item>
		<item name="android:paddingEnd">?android:attr/listPreferredItemPaddingEnd</item>
		</style>

		<style name="ExpressiveSelectorWithWidgetPreferenceWidgetFrameStyle">
		<item name="android:layout_width">wrap_content</item>
		<item name="android:layout_height">wrap_content</item>
		<item name="android:gravity">center</item>
		<item name="android:minWidth">@dimen/settingslib_expressive_space_medium3</item>
		<item name="android:minHeight">@dimen/settingslib_expressive_space_medium3</item>
		<item name="android:layout_marginEnd">@dimen/settingslib_expressive_space_extrasmall6</item>
		<item name="android:orientation">vertical</item>
		</style>

		<style name="ExpressiveSelectorWithWidgetPreferenceIconStyle">
		<item name="android:layout_width">wrap_content</item>
		<item name="android:layout_height">wrap_content</item>
		<item name="maxWidth">@dimen/secondary_app_icon_size</item>
		<item name="maxHeight">@dimen/secondary_app_icon_size</item>
		</style>

		<style name="ExpressiveSelectorWithWidgetPreferenceTextContainerStyle">
		<item name="android:layout_width">0dp</item>
		<item name="android:layout_height">wrap_content</item>
		<item name="android:layout_weight">1</item>
		<item name="android:orientation">vertical</item>
		<item name="android:paddingTop">@dimen/settingslib_expressive_space_small1</item>
		<item name="android:paddingBottom">@dimen/settingslib_expressive_space_small1</item>
		<item name="android:paddingEnd">?android:attr/listPreferredItemPaddingEnd</item>
		</style>

		<style name="ExpressiveSelectorWithWidgetPreferenceTitleStyle">
		<item name="android:layout_width">wrap_content</item>
		<item name="android:layout_height">wrap_content</item>
		<item name="android:maxLines">2</item>
		<item name="android:ellipsize">end</item>
		<item name="android:hyphenationFrequency">normalFast</item>
		<item name="android:lineBreakWordStyle">phrase</item>
		<item name="android:textAppearance">?android:attr/textAppearanceListItem</item>
		</style>

		<style name="ExpressiveSelectorWithWidgetPreferenceSummaryContainerStyle">
		<item name="android:layout_width">match_parent</item>
		<item name="android:layout_height">wrap_content</item>
		<item name="android:visibility">gone</item>
		</style>

		<style name="ExpressiveSelectorWithWidgetPreferenceSummaryStyle">
		<item name="android:layout_width">0dp</item>
		<item name="android:layout_height">wrap_content</item>
		<item name="android:layout_weight">1</item>
		<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
		<item name="android:textAlignment">viewStart</item>
		<item name="android:hyphenationFrequency">normalFast</item>
		<item name="android:lineBreakWordStyle">phrase</item>
		<item name="android:textColor">?android:attr/textColorSecondary</item>
		</style>

		<style name="ExpressiveSelectorWithWidgetPreferenceAppendixStyle">
		<item name="android:layout_width">0dp</item>
		<item name="android:layout_height">wrap_content</item>
		<item name="android:layout_weight">1</item>
		<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
		<item name="android:textAlignment">viewEnd</item>
		<item name="android:textColor">?android:attr/textColorSecondary</item>
		<item name="android:maxLines">1</item>
		<item name="android:visibility">gone</item>
		<item name="android:ellipsize">end</item>
		</style>

		<style name="ExpressiveSelectorWithWidgetPreferenceExtraWidgetContainerStyle">
		<item name="android:layout_width">wrap_content</item>
		<item name="android:layout_height">match_parent</item>
		<item name="android:orientation">horizontal</item>
		<item name="android:gravity">center_vertical</item>
		</style>

		<style name="ExpressiveSelectorWithWidgetPreferenceExtraWidgetDividerStyle">
		<item name="android:layout_width">.75dp</item>
		<item name="android:layout_height">32dp</item>
		<item name="android:layout_marginTop">@dimen/settingslib_expressive_space_small1</item>
		<item name="android:layout_marginBottom">@dimen/settingslib_expressive_space_small1</item>
		<item name="android:background">?android:attr/dividerVertical</item>
		</style>

		<style name="ExpressiveSelectorWithWidgetPreferenceExtraWidgetImageStyle">
		<item name="android:layout_width">match_parent</item>
		<item name="android:layout_height">fill_parent</item>
		<item name="android:minWidth">@dimen/settingslib_expressive_space_medium4</item>
		<item name="android:src">@drawable/ic_settings_accent</item>
		<item name="android:scaleType">centerInside</item>
		<item name="android:contentDescription">@string/settings_label</item>
		<item name="android:layout_gravity">center</item>
		<item name="android:background">?android:attr/selectableItemBackground</item>
		</style>
		</resources>

packages/SettingsLib/SelectorWithWidgetPreference/src/com/android/settingslib/widget/SelectorWithWidgetPreference.java

+18 −3

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.settingslib.widget;

		import android.content.Context;
		import android.content.res.Resources;
		import android.content.res.TypedArray;
		import android.text.TextUtils;
		import android.util.AttributeSet;
		@@ -86,7 +87,7 @@ public class SelectorWithWidgetPreference extends CheckBoxPreference {
		*/
		public SelectorWithWidgetPreference(@NonNull Context context, @Nullable AttributeSet attrs,
		int defStyle) {
		super(context, attrs, defStyle);
		super(applyExpressivePreferenceThemeOverlay(context), attrs, defStyle);
		init(context, attrs, defStyle, /* defStyleRes= */ 0);
		}

		@@ -98,7 +99,7 @@ public class SelectorWithWidgetPreference extends CheckBoxPreference {
		* @param attrs The attributes of the XML tag that is inflating the preference
		*/
		public SelectorWithWidgetPreference(Context context, AttributeSet attrs) {
		super(context, attrs);
		super(applyExpressivePreferenceThemeOverlay(context), attrs);
		init(context, attrs, /* defStyleAttr= / 0, / defStyleRes= */ 0);
		}

		@@ -109,7 +110,7 @@ public class SelectorWithWidgetPreference extends CheckBoxPreference {
		* @param isCheckbox Whether this preference should display as a checkbox.
		*/
		public SelectorWithWidgetPreference(Context context, boolean isCheckbox) {
		super(context, null);
		super(applyExpressivePreferenceThemeOverlay(context), null);
		mIsCheckBox = isCheckbox;
		init(context, /* attrs= / null, / defStyleAttr= / 0, / defStyleRes= */ 0);
		}
		@@ -249,6 +250,20 @@ public class SelectorWithWidgetPreference extends CheckBoxPreference {
		a.recycle();
		}

		@NonNull
		private static Context applyExpressivePreferenceThemeOverlay(@NonNull Context context) {
		TypedArray typedArray = context.obtainStyledAttributes(new int[] {
		com.android.settingslib.widget.theme.R.attr
		.expressiveSelectorWithWidgetPreferenceTheme});
		// Since the context is shared, only try to apply the theme if it 's not resolved.
		if (typedArray.getResourceId(0, Resources.ID_NULL) == Resources.ID_NULL) {
		context.getTheme().applyStyle(
		R.style.ThemeOverlay_ExpressiveSelectorWithWidgetPreference, false);
		}
		typedArray.recycle();
		return context;
		}

		@VisibleForTesting(otherwise = VisibleForTesting.NONE)
		public View getExtraWidget() {
		return mExtraWidget;

packages/SettingsLib/SettingsTheme/res/layout-v36/settingslib_expressive_preference.xml

+7 −18

Original line number	Diff line number	Diff line
		@@ -19,26 +19,15 @@
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:minHeight="72dp"
		android:gravity="center_vertical"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:background="?android:attr/selectableItemBackground"
		android:clipToPadding="false"
		android:baselineAligned="false"
		android:filterTouchesWhenObscured="false">
		android:filterTouchesWhenObscured="false"
		android:theme="?expressivePreferenceTheme"
		style="?expressivePreferenceRootLayoutStyle">

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

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

		<!-- Preference should place its actual preference widget here. -->
		<LinearLayout
		android:id="@android:id/widget_frame"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:gravity="end\|center_vertical"
		android:minWidth="@dimen/settingslib_expressive_space_medium4"
		android:orientation="vertical"/>

		style="?expressivePreferenceWidgetFrameStyle" />
		</LinearLayout>

packages/SettingsLib/SettingsTheme/res/layout-v36/settingslib_expressive_preference_icon_frame.xml

+4 −11

Original line number	Diff line number	Diff line
		@@ -14,21 +14,14 @@
		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:id="@+id/icon_frame"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:minWidth="@dimen/settingslib_expressive_space_medium3"
		android:minHeight="@dimen/settingslib_expressive_space_medium3"
		android:gravity="center"
		android:layout_marginEnd="@dimen/settingslib_expressive_space_extrasmall6"
		android:filterTouchesWhenObscured="false">
		android:filterTouchesWhenObscured="false"
		style="?expressivePreferenceIconFrameStyle">

		<androidx.preference.internal.PreferenceImageView
		android:id="@android:id/icon"
		android:layout_width="@dimen/settingslib_expressive_space_medium3"
		android:layout_height="@dimen/settingslib_expressive_space_medium3"
		android:scaleType="centerInside"/>

		style="?expressivePreferenceIconStyle" />
		</LinearLayout>