From bb3f56fc022888ab7d571666eb034bd5ffa2d3aa Mon Sep 17 00:00:00 2001 From: Alan Huang Date: Wed, 18 May 2022 09:21:01 +0000 Subject: [PATCH] Update Spatial audio settings page Bug: 229048602 Test: local build and verify page Change-Id: I096eae1bd0ca3acd52e6025963a08b0d60cb8d74 --- res/values/strings.xml | 8 +++++++- res/xml/spatial_audio_settings.xml | 5 +++++ .../notification/SpatialAudioSettings.java | 18 ++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 1d01f14bb8e..6a0fad2304a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -8616,7 +8616,7 @@ Wired headphones - Spatial Audio creates immersive sound that seems like it’s coming from all around you. Only works with some media. + Audio from compatible media becomes more immersive Off @@ -8627,6 +8627,12 @@ On / %1$s and %2$s + + You can also turn on Spatial Audio for Bluetooth devices. + + + Connected devices settings + {count, plural, diff --git a/res/xml/spatial_audio_settings.xml b/res/xml/spatial_audio_settings.xml index da339868bb7..13d3b255f56 100644 --- a/res/xml/spatial_audio_settings.xml +++ b/res/xml/spatial_audio_settings.xml @@ -34,4 +34,9 @@ android:title="@string/spatial_audio_wired_headphones" settings:controller="com.android.settings.notification.SpatialAudioWiredHeadphonesController"/> + diff --git a/src/com/android/settings/notification/SpatialAudioSettings.java b/src/com/android/settings/notification/SpatialAudioSettings.java index 001c6176dbc..3bdb52411d3 100644 --- a/src/com/android/settings/notification/SpatialAudioSettings.java +++ b/src/com/android/settings/notification/SpatialAudioSettings.java @@ -17,11 +17,15 @@ package com.android.settings.notification; import android.app.settings.SettingsEnums; +import android.content.Intent; +import android.os.Bundle; +import android.provider.Settings; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.search.SearchIndexable; +import com.android.settingslib.widget.FooterPreference; /** * Spatial audio settings located in the sound menu @@ -30,6 +34,20 @@ import com.android.settingslib.search.SearchIndexable; public class SpatialAudioSettings extends DashboardFragment { private static final String TAG = "SpatialAudioSettings"; + private static final String KEY_FOOTER = "spatial_audio_footer"; + + @Override + public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { + super.onCreatePreferences(savedInstanceState, rootKey); + + FooterPreference footerPreference = findPreference(KEY_FOOTER); + if (footerPreference != null) { + footerPreference.setLearnMoreText( + getString(R.string.spatial_audio_footer_learn_more_text)); + footerPreference.setLearnMoreAction( + view -> startActivity(new Intent(Settings.ACTION_BLUETOOTH_SETTINGS))); + } + } @Override public int getMetricsCategory() {