Snap for 13197820 from 04cfbe0520f37627c0402f9b5b8bd346b5a24229 to 25Q2-release (e6db3bfd) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+2 −2

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

		<activity android:name="Settings$UserAspectRatioAppListActivity"
		android:exported="true"
		android:label="@string/aspect_ratio_experimental_title">
		android:label="@string/aspect_ratio_title">
		<intent-filter android:priority="1">
		<action android:name="android.settings.MANAGE_USER_ASPECT_RATIO_SETTINGS"/>
		<category android:name="android.intent.category.DEFAULT" />
		@@ -1912,7 +1912,7 @@

		<activity android:name="Settings$UserAspectRatioAppActivity"
		android:exported="true"
		android:label="@string/aspect_ratio_experimental_title">
		android:label="@string/aspect_ratio_title">
		<intent-filter>
		<action android:name="android.settings.MANAGE_USER_ASPECT_RATIO_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />

aconfig/settings_bluetooth_declarations.aconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ flag {
		flag {
		name: "enable_remove_association_bt_unpair"
		is_exported: true
		namespace: "companion_device_manager"
		namespace: "companion"
		description: "Allow to disassociate when to forget a BT pair device"
		bug: "365613753"
		}

res/drawable/device_details_spotlight_preference_background.xml

0 → 100644

+28 −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.
		-->

		<ripple xmlns:android="http://schemas.android.com/apk/res/android"
		android:color="?android:colorControlHighlight">
		<item>
		<shape android:shape="rectangle">
		<solid
		android:color="@color/settingslib_materialColorSecondaryContainer" />
		<corners
		android:radius="28dp" />
		</shape>
		</item>
		</ripple>

res/layout/bluetooth_device_spotlight_preference.xml

0 → 100644

+73 −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.
		-->
		<FrameLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingEnd="?android:attr/scrollbarSize"
		android:background="?android:attr/selectableItemBackground">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_marginHorizontal="16dp"
		android:background="@drawable/device_details_spotlight_preference_background" />

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:minHeight="?android:attr/listPreferredItemHeight"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:gravity="center_vertical">

		<ImageView
		android:id="@+android:id/icon"
		android:layout_width="24dip"
		android:layout_height="24dip"
		android:layout_gravity="center"
		android:scaleType="center"
		android:importantForAccessibility="no" />

		<RelativeLayout
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_marginStart="24dp"
		android:layout_marginEnd="6dp"
		android:layout_marginTop="6dp"
		android:layout_marginBottom="6dp"
		android:layout_weight="1">

		<TextView android:id="@+android:id/title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:textAppearance="?android:attr/textAppearanceLarge"
		android:ellipsize="marquee"
		android:fadingEdge="horizontal" />

		<TextView android:id="@+android:id/summary"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_below="@android:id/title"
		android:layout_alignStart="@android:id/title"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textColor="?android:attr/textColorSecondary"
		android:maxLines="4" />
		</RelativeLayout>
		</LinearLayout>
		</FrameLayout>

res/layout/bluetooth_pin_confirm.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -101,7 +101,8 @@
		android:hyphenationFrequency="normalFast"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Caption" />
		</LinearLayout>
		<Switch
		<com.google.android.material.materialswitch.MaterialSwitch
		android:theme="@style/Theme.Material3.DynamicColors.DayNight"
		android:id="@+id/phonebook_sharing_message_confirm_pin"
		android:layout_width="wrap_content"
		android:layout_height="48dp"