Add setting page for the Spatial audio

The Spatial audio settings page control the state for the phone speaker
and the wired headphones

Test: make RunSettingsRoboTests

Bug: 220811398
Change-Id: I49e3fab48186d09357a8481652bdccb4aa5d044a
This commit is contained in:
Alan Huang
2022-02-22 08:44:47 +00:00
parent 45a0eb3483
commit f1ecb4fb48
10 changed files with 488 additions and 27 deletions

View File

@@ -8531,6 +8531,24 @@
<!-- Setting summary for controlling how caption text display in real time [CHAR LIMIT=NONE]-->
<string name="live_caption_summary">Automatically caption media</string>
<!-- Output device type for the phone speaker that is available for spatializer effect. [CHAR LIMIT=NONE]-->
<string name="spatial_audio_speaker">Phone speaker</string>
<!-- Output device type for the wired headphones that is available for spatializer effect. [CHAR LIMIT=NONE]-->
<string name="spatial_audio_wired_headphones">Wired headphones</string>
<!-- Sound: Summary for the spatializer effect. [CHAR LIMIT=NONE]-->
<string name="spatial_audio_text">Spatial Audio creates immersive sound that seems like its coming from all around you. Only works with some media.</string>
<!-- Sound: Summary for the Spatial audio setting when it is off. [CHAR LIMIT=NONE]-->
<string name="spatial_summary_off">Off</string>
<!-- Sound: Summary for the Spatial audio setting when it is on with one output device enabled. [CHAR LIMIT=NONE]-->
<string name="spatial_summary_on_one">On / <xliff:g id="output device" example="Phone speaker">%1$s</xliff:g></string>
<!-- Sound: Summary for the Spatial audio setting when it is on with two output devices enabled. [CHAR LIMIT=NONE]-->
<string name="spatial_summary_on_two">On / <xliff:g id="output device" example="Phone speaker">%1$s</xliff:g> and <xliff:g id="output device" example="Wired headphones">%2$s</xliff:g></string>
<!-- Sound: Summary for the Do not Disturb option that describes how many automatic rules (schedules) are enabled [CHAR LIMIT=NONE]-->
<string name="zen_mode_settings_schedules_summary">
{count, plural,

View File

@@ -111,6 +111,15 @@
settings:keywords="@string/sound_settings"/>
<!-- Live Caption -110 and Now Playing -105-->
<!-- Spatial audio -->
<Preference
android:key="spatial_audio_summary"
android:title="@string/spatial_audio_title"
android:fragment="com.android.settings.notification.SpatialAudioSettings"
android:order="-107"
settings:controller="com.android.settings.notification.SpatialAudioParentPreferenceController"/>
<Preference
android:key="media_controls_summary"
android:title="@string/media_controls_title"
@@ -154,13 +163,6 @@
android:ringtoneType="alarm"
android:order="-60"/>
<!-- Spatial audio -->
<SwitchPreference
android:key="spatial_audio"
android:title="@string/spatial_audio_title"
android:order="-55"
settings:controller="com.android.settings.notification.SpatialAudioPreferenceController"/>
<!-- Dial pad tones -->
<SwitchPreference
android:key="dial_pad_tones"

View File

@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2022 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.
-->
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/spatial_audio_title">
<com.android.settingslib.widget.TopIntroPreference
android:key="spatial_audio_top_intro"
android:title="@string/spatial_audio_text"
settings:searchable="false"/>
<SwitchPreference
android:key="spatial_audio"
android:title="@string/spatial_audio_speaker"
settings:controller="com.android.settings.notification.SpatialAudioPreferenceController"/>
<SwitchPreference
android:key="spatial_audio_wired_headphones"
android:title="@string/spatial_audio_wired_headphones"
settings:controller="com.android.settings.notification.SpatialAudioWiredHeadphonesController"/>
</PreferenceScreen>