diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:04:46 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:04:46 +0000 |
commit | ab1914e1f447c5b14275a28d25a3118fa8b57a49 (patch) | |
tree | 801e5153963a9a347f13082c836e331d5a8e3760 /Settings/src/com/android/tv/settings/SuggestionQuickSettingPrefsContainer.java | |
parent | 4fb82a3727573e82b4fe85b6a6fa37f5fa9d1235 (diff) | |
parent | 4eb7b888ab394100643c6500e06e3b31f1780760 (diff) | |
download | TvSettings-aml_mpr_341511070.tar.gz |
Snap for 10453563 from 4eb7b888ab394100643c6500e06e3b31f1780760 to mainline-mediaprovider-releaseaml_mpr_341713020aml_mpr_341614010aml_mpr_341511070aml_mpr_341411070aml_mpr_341313030aml_mpr_341111030aml_mpr_341111020aml_mpr_341015090aml_mpr_341015030aml_mpr_340919000android14-mainline-mediaprovider-release
Change-Id: I5d851461ffeb0df0c59292add894e6e7b9d4fe32
Diffstat (limited to 'Settings/src/com/android/tv/settings/SuggestionQuickSettingPrefsContainer.java')
-rw-r--r-- | Settings/src/com/android/tv/settings/SuggestionQuickSettingPrefsContainer.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Settings/src/com/android/tv/settings/SuggestionQuickSettingPrefsContainer.java b/Settings/src/com/android/tv/settings/SuggestionQuickSettingPrefsContainer.java index 139554389..2841e8608 100644 --- a/Settings/src/com/android/tv/settings/SuggestionQuickSettingPrefsContainer.java +++ b/Settings/src/com/android/tv/settings/SuggestionQuickSettingPrefsContainer.java @@ -1,5 +1,7 @@ package com.android.tv.settings; +import static com.android.tv.settings.util.InstrumentationUtils.logEntrySelected; + import android.app.tvsettings.TvSettingsEnums; import android.content.ActivityNotFoundException; import android.content.ComponentName; @@ -11,22 +13,19 @@ import android.util.Log; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; -import androidx.preference.SwitchPreference; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.suggestions.SuggestionControllerMixinCompat; import com.android.settingslib.utils.IconCache; -import com.android.tv.settings.HotwordSwitchController.HotwordStateListener; import com.android.tv.settings.R; -import com.android.tv.settings.library.overlay.FlavorUtils; +import com.android.tv.settings.overlay.FlavorUtils; import com.android.tv.settings.suggestions.SuggestionPreference; import com.android.tv.settings.system.SecurityFragment; +import com.android.tv.settings.widget.SwitchWithSoundPreference; import java.util.ArrayList; import java.util.List; -import static com.android.tv.settings.util.InstrumentationUtils.logEntrySelected; - public class SuggestionQuickSettingPrefsContainer { @VisibleForTesting static final String KEY_QUICK_SETTINGS = "quick_settings"; private static final String TAG = "SuggestionQuickSettingPrefsContainer"; @@ -40,7 +39,7 @@ public class SuggestionQuickSettingPrefsContainer { private HotwordSwitchController mHotwordSwitchController; private TakeBugReportController mTakeBugReportController; private PreferenceCategory mQuickSettingsList; - private SwitchPreference mHotwordSwitch; + private SwitchWithSoundPreference mHotwordSwitch; private Preference mTakeBugReportPreference; private MainFragment mainFragment; @@ -212,7 +211,7 @@ public class SuggestionQuickSettingPrefsContainer { mQuickSettingsList.setOrder(1); // at top, but below suggested settings mainFragment.getPreferenceScreen().addPreference(mQuickSettingsList); if (mHotwordSwitchController != null && mHotwordSwitchController.isAvailable()) { - mHotwordSwitch = new SwitchPreference( + mHotwordSwitch = new SwitchWithSoundPreference( mainFragment.getPreferenceManager().getContext()); mHotwordSwitch.setKey(HotwordSwitchController.KEY_HOTWORD_SWITCH); mHotwordSwitch.setOnPreferenceClickListener(preference -> { |