Merge "Implement Hearing Devices Quick Settings Tile (1/n)" into main (1412c1ab) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -1001,6 +1001,21 @@ public final class Settings {
		public static final String ACTION_BLUETOOTH_SETTINGS =
		"android.settings.BLUETOOTH_SETTINGS";

		/**
		* Activity Action: Show settings to allow configuration of Hearing Devices.
		* <p>
		* In some cases, a matching Activity may not exist, so ensure you
		* safeguard against this.
		* <p>
		* Input: Nothing.
		* <p>
		* Output: Nothing.
		* @hide
		*/
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_HEARING_DEVICES_SETTINGS =
		"android.settings.HEARING_DEVICES_SETTINGS";

		/**
		* Activity action: Show Settings app search UI when this action is available for device.
		* <p>

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		<!--
		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.
		-->

		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="18dp"
		android:height="18dp"
		android:viewportWidth="24"
		android:viewportHeight="24">
		<path
		android:fillColor="#ffffff"
		android:pathData="M17,20c-0.29,0 -0.56,-0.06 -0.76,-0.15 -0.71,-0.37 -1.21,-0.88 -1.71,-2.38 -0.51,-1.56 -1.47,-2.29 -2.39,-3 -0.79,-0.61 -1.61,-1.24 -2.32,-2.53C9.29,10.98 9,9.93 9,9c0,-2.8 2.2,-5 5,-5s5,2.2 5,5h2c0,-3.93 -3.07,-7 -7,-7S7,5.07 7,9c0,1.26 0.38,2.65 1.07,3.9 0.91,1.65 1.98,2.48 2.85,3.15 0.81,0.62 1.39,1.07 1.71,2.05 0.6,1.82 1.37,2.84 2.73,3.55 0.51,0.23 1.07,0.35 1.64,0.35 2.21,0 4,-1.79 4,-4h-2c0,1.1 -0.9,2 -2,2zM7.64,2.64L6.22,1.22C4.23,3.21 3,5.96 3,9s1.23,5.79 3.22,7.78l1.41,-1.41C6.01,13.74 5,11.49 5,9s1.01,-4.74 2.64,-6.36zM11.5,9c0,1.38 1.12,2.5 2.5,2.5s2.5,-1.12 2.5,-2.5 -1.12,-2.5 -2.5,-2.5 -2.5,1.12 -2.5,2.5z"/>
		</vector>
		No newline at end of file

+1 −1

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

		<!-- Tiles native to System UI. Order should match "quick_settings_tiles_default" -->
		<string name="quick_settings_tiles_stock" translatable="false">
		internet,bt,flashlight,dnd,alarm,airplane,controls,wallet,rotation,battery,cast,screenrecord,mictoggle,cameratoggle,location,hotspot,inversion,saver,dark,work,night,reverse,reduce_brightness,qr_code_scanner,onehanded,color_correction,dream,font_scaling,record_issue
		internet,bt,flashlight,dnd,alarm,airplane,controls,wallet,rotation,battery,cast,screenrecord,mictoggle,cameratoggle,location,hotspot,inversion,saver,dark,work,night,reverse,reduce_brightness,qr_code_scanner,onehanded,color_correction,dream,font_scaling,record_issue,hearing_devices
		</string>

		<!-- The tiles to display in QuickSettings -->

+3 −0

Original line number	Diff line number	Diff line
		@@ -899,6 +899,9 @@
		<!-- QuickSettings: Contrast tile description: high [CHAR LIMIT=NONE] -->
		<string name="quick_settings_contrast_high">High</string>

		<!-- QuickSettings: Hearing devices [CHAR LIMIT=NONE] -->
		<string name="quick_settings_hearing_devices_label">Hearing devices</string>

		<!--- Title of dialog triggered if the microphone is disabled but an app tried to access it. [CHAR LIMIT=150] -->
		<string name="sensor_privacy_start_use_mic_dialog_title">Unblock device microphone?</string>
		<!--- Title of dialog triggered if the camera is disabled but an app tried to access it. [CHAR LIMIT=150] -->

+10 −0

Original line number	Diff line number	Diff line
		@@ -338,4 +338,14 @@
		<item>Off</item>
		<item>On</item>
		</string-array>

		<!-- State names for hearing devices tile: unavailable, off, on.
		This subtitle is shown when the tile is in that particular state but does not set its own
		subtitle, so some of these may never appear on screen. They should still be translated as
		if they could appear. [CHAR LIMIT=32] -->
		<string-array name="tile_states_hearing_devices">
		<item>Unavailable</item>
		<item>Off</item>
		<item>On</item>
		</string-array>
		</resources>
		No newline at end of file