Show intro and footer string according to the device's supported status

Bug: 390078046
Bug: 386121967
Test: atest HearingAidHelperTest HearingDeviceFooterPreferenceControllerTest HearingDeviceIntroPreferenceControllerTest BluetoothDetailsHearingDeviceSettingsControllerTest
Flag: EXEMPT bugfix
Change-Id: I564cdb80cd14f4d2d8e882b64db939449c6936b7
Signed-off-by: Jie Wang <jie.x.wang@sony.com>
Signed-off-by: Jason Hsu <jasonwshsu@google.com>
This commit is contained in:
jasonwshsu
2025-02-11 03:16:46 +08:00
parent 2117499c9e
commit 9cfc96d948
10 changed files with 418 additions and 14 deletions

View File

@@ -94,6 +94,22 @@ public class HearingAidHelper {
|| supportedList.contains(BluetoothProfile.HAP_CLIENT);
}
/**
* Checks if {@link BluetoothProfile#HEARING_AID} supported.
*/
public boolean isAshaProfileSupported() {
final List<Integer> supportedList = mBluetoothAdapter.getSupportedProfiles();
return supportedList.contains(BluetoothProfile.HEARING_AID);
}
/**
* Checks if {@link BluetoothProfile#HAP_CLIENT} supported.
*/
public boolean isHapClientProfileSupported() {
final List<Integer> supportedList = mBluetoothAdapter.getSupportedProfiles();
return supportedList.contains(BluetoothProfile.HAP_CLIENT);
}
/**
* Checks if {@link BluetoothProfile#HEARING_AID} or {@link BluetoothProfile#HAP_CLIENT}
* profiles all ready.

View File

@@ -24,12 +24,27 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.google.common.annotations.VisibleForTesting;
/** Preference controller for footer in hearing device page. */
public class HearingDeviceFooterPreferenceController extends
AccessibilityFooterPreferenceController {
public HearingDeviceFooterPreferenceController(Context context,
String key) {
private final HearingAidHelper mHelper;
public HearingDeviceFooterPreferenceController(
@NonNull Context context,
@NonNull String key) {
super(context, key);
mHelper = new HearingAidHelper(context);
}
@VisibleForTesting
public HearingDeviceFooterPreferenceController(
@NonNull Context context,
@NonNull String key,
@NonNull HearingAidHelper hearingAidHelper) {
super(context, key);
mHelper = hearingAidHelper;
}
@Override
@@ -37,22 +52,47 @@ public class HearingDeviceFooterPreferenceController extends
return mContext.getString(R.string.accessibility_hearing_device_about_title);
}
@Override
public int getAvailabilityStatus() {
return mHelper.isHearingAidSupported() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
public void displayPreference(@NonNull PreferenceScreen screen) {
super.displayPreference(screen);
final AccessibilityFooterPreference footerPreference =
screen.findPreference(getPreferenceKey());
final boolean isAshaProfileSupported = mHelper.isAshaProfileSupported();
final boolean isHapClientProfileSupported = mHelper.isHapClientProfileSupported();
final String summary;
final String summaryTts;
if (isAshaProfileSupported && isHapClientProfileSupported) {
summary = mContext.getString(R.string.accessibility_hearing_device_footer_summary);
summaryTts = mContext.getString(
R.string.accessibility_hearing_device_footer_summary_tts);
} else if (isAshaProfileSupported) {
summary = mContext.getString(
R.string.accessibility_hearing_device_footer_asha_only_summary);
summaryTts = mContext.getString(
R.string.accessibility_hearing_device_footer_asha_only_summary_tts);
} else if (isHapClientProfileSupported) {
summary = mContext.getString(
R.string.accessibility_hearing_device_footer_hap_only_summary);
summaryTts = mContext.getString(
R.string.accessibility_hearing_device_footer_hap_only_summary_tts);
} else {
return;
}
// We use html tag inside footer string, so it is better to load from html to have better
// html tag support.
final CharSequence title = Html.fromHtml(
mContext.getString(R.string.accessibility_hearing_device_footer_summary),
summary,
Html.FROM_HTML_MODE_COMPACT, /* imageGetter= */ null, /* tagHandler= */ null);
footerPreference.setTitle(title);
// Need to update contentDescription string to announce "than" rather than ">"
final String summaryTts = mContext.getString(
R.string.accessibility_hearing_device_footer_summary_tts);
final String contentDescription = getIntroductionTitle() + "\n\n" + summaryTts;
footerPreference.setContentDescription(contentDescription);
}

View File

@@ -0,0 +1,74 @@
/*
* Copyright (C) 2025 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.
*/
package com.android.settings.accessibility;
import android.content.Context;
import androidx.annotation.NonNull;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.google.common.annotations.VisibleForTesting;
public class HearingDeviceIntroPreferenceController extends BasePreferenceController {
private final HearingAidHelper mHelper;
public HearingDeviceIntroPreferenceController(
@NonNull Context context,
@NonNull String preferenceKey) {
super(context, preferenceKey);
mHelper = new HearingAidHelper(context);
}
@VisibleForTesting
public HearingDeviceIntroPreferenceController(
@NonNull Context context,
@NonNull String preferenceKey,
@NonNull HearingAidHelper hearingAidHelper) {
super(context, preferenceKey);
mHelper = hearingAidHelper;
}
@Override
public int getAvailabilityStatus() {
return mHelper.isHearingAidSupported() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
public void displayPreference(@NonNull PreferenceScreen screen) {
super.displayPreference(screen);
final Preference introPreference = screen.findPreference(getPreferenceKey());
final boolean isAshaProfileSupported = mHelper.isAshaProfileSupported();
final boolean isHapClientProfileSupported = mHelper.isHapClientProfileSupported();
if (isAshaProfileSupported && isHapClientProfileSupported) {
introPreference.setTitle(mContext.getString(R.string.accessibility_hearingaid_intro));
} else if (isAshaProfileSupported) {
introPreference.setTitle(
mContext.getString(R.string.accessibility_hearingaid_asha_only_intro));
} else if (isHapClientProfileSupported) {
introPreference.setTitle(
mContext.getString(R.string.accessibility_hearingaid_hap_only_intro));
} else {
// Intentionally blank, getAvailabilityStatus() should handle visibility for
// none-supported case.
}
}
}

View File

@@ -53,7 +53,7 @@ public class BluetoothDetailsHearingDeviceSettingsController extends BluetoothDe
@Override
public boolean isAvailable() {
return mCachedDevice.isHearingAidDevice();
return mCachedDevice.isHearingDevice();
}
@Override