Snap for 12335440 from c3cfb42524a3823d1a3a2eb6d15feb13b0d87d44 to 24Q4-release (838881eb) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+20 −0

Original line number	Diff line number	Diff line
		@@ -3227,6 +3227,19 @@
		</intent-filter>
		</activity>

		<activity android:name=".bluetooth.BluetoothKeyMissingDialog"
		android:permission="android.permission.BLUETOOTH_PRIVILEGED"
		android:excludeFromRecents="true"
		android:windowSoftInputMode="stateVisible\|adjustResize"
		android:theme="@style/Theme.AlertDialog"
		android:exported="false"
		android:taskAffinity=".bluetooth.BluetoothKeyMissingDialog">
		<intent-filter android:priority="1">
		<action android:name="android.bluetooth.device.action.KEY_MISSING" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		</activity>

		<activity android:name=".bluetooth.RequestPermissionActivity"
		android:excludeFromRecents="true"
		android:permission="android.permission.BLUETOOTH_CONNECT"
		@@ -3281,6 +3294,13 @@
		</intent-filter>
		</receiver>

		<receiver android:name=".bluetooth.BluetoothKeyMissingReceiver"
		android:exported="true">
		<intent-filter>
		<action android:name="android.bluetooth.device.action.KEY_MISSING" />
		</intent-filter>
		</receiver>

		<receiver android:name=".bluetooth.BluetoothPermissionRequest"
		android:exported="true"
		android:permission="android.permission.BLUETOOTH_CONNECT">

aconfig/accessibility/accessibility_flags.aconfig

+13 −3

Original line number	Diff line number	Diff line
		@@ -37,6 +37,13 @@ flag {
		bug: "300302098"
		}

		flag {
		name: "enable_color_contrast_control"
		namespace: "accessibility"
		description: "Allows users to control color contrast in the Accessibility settings page."
		bug: "246577325"
		}

		flag {
		name: "enable_hearing_aid_preset_control"
		namespace: "accessibility"
		@@ -89,8 +96,11 @@ flag {
		}

		flag {
		name: "enable_color_contrast_control"
		name: "toggle_feature_fragment_collection_info"
		namespace: "accessibility"
		description: "Allows users to control color contrast in the Accessibility settings page."
		bug: "246577325"
		description: "Provides custom CollectionInfo for ToggleFeaturePreferenceFragment"
		bug: "318607873"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

aconfig/settings_bluetooth_declarations.aconfig

+10 −0

Original line number	Diff line number	Diff line
		@@ -34,3 +34,13 @@ flag {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "enable_bluetooth_key_missing_dialog"
		namespace: "cross_device_experiences"
		description: "Show a dialog if the bluetooth key is missing when reconnecting"
		bug: "360031750"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

res/layout/bluetooth_key_missing.xml

0 → 100644

+58 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2024 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.
		-->

		<ScrollView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:paddingTop="@dimen/bluetooth_dialog_padding_top">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:paddingStart="24dp"
		android:paddingEnd="24dp">

		<ImageView
		android:id="@id/preview_placeholder"
		android:layout_width="32dp"
		android:layout_height="32dp"
		android:layout_gravity="center"
		android:importantForAccessibility="no"
		android:src="@drawable/ic_warning_24dp"
		android:tint="@color/settingslib_materialColorOutline" />

		<TextView
		android:id="@+id/bluetooth_key_missing_title"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="20dp"
		android:gravity="center"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Title" />

		<TextView
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="20dp"
		android:text="@string/bluetooth_key_missing_message"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1" />

		</LinearLayout>


		</ScrollView>
		No newline at end of file

res/values/strings.xml

+9 −0

Original line number	Diff line number	Diff line
		@@ -1860,6 +1860,15 @@
		<!-- Bluetooth settings. Link text to bring the user to "scanning settings" screen. [CHAR LIMIT=NONE]-->
		<string name="bluetooth_scan_change">Change</string>

		<!-- Dialog title when key is missing in a Bluetooth device -->
		<string name="bluetooth_key_missing_title"><xliff:g id="device_name">%1$s</xliff:g> not connected</string>
		<!-- Dialog content when key is missing in a Bluetooth device -->
		<string name="bluetooth_key_missing_message">For your security, forget this device, then pair it again</string>
		<!-- Button text to forget device when bluetooth key is missing -->
		<string name="bluetooth_key_missing_forget">Forget device</string>
		<!-- Button text to cancel when bluetooth key is missing-->
		<string name="bluetooth_key_missing_cancel">Cancel</string>

		<!-- Title of device details screen [CHAR LIMIT=28]-->
		<string name="device_details_title">Device details</string>
		<!-- Title for keyboard settings preferences. [CHAR LIMIT=50] -->