[hearing devices page] Add feature flag to control visibility of the hearing devices page
* Setup basic xml for hearing devices page Bug: 237625815 Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityHearingAidsFragmentTest Change-Id: I3cc794e124d1dfda46f8d5fba658de47f84b63f5
This commit is contained in:
47
res/xml/accessibility_hearing_aids.xml
Normal file
47
res/xml/accessibility_hearing_aids.xml
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
<?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:key="accessibility_hearing_devices_screen"
|
||||||
|
android:title="@string/accessibility_hearingaid_title">
|
||||||
|
|
||||||
|
<com.android.settingslib.RestrictedPreference
|
||||||
|
android:key="add_bt_devices"
|
||||||
|
android:title="@string/bluetooth_pairing_pref_title"
|
||||||
|
android:icon="@drawable/ic_add_24dp"
|
||||||
|
android:summary="@string/connected_device_add_device_summary"
|
||||||
|
settings:userRestriction="no_config_bluetooth"
|
||||||
|
settings:useAdminDisabledSummary="true" />
|
||||||
|
|
||||||
|
<PreferenceCategory
|
||||||
|
android:key="device_control_category"
|
||||||
|
android:title="@string/accessibility_hearing_device_control">
|
||||||
|
|
||||||
|
<SwitchPreference
|
||||||
|
android:key="hearing_aid_compatibility"
|
||||||
|
android:title="@string/accessibility_hac_mode_title"
|
||||||
|
android:summary="@string/accessibility_hac_mode_summary"
|
||||||
|
settings:searchable="true" />
|
||||||
|
|
||||||
|
</PreferenceCategory>
|
||||||
|
|
||||||
|
<com.android.settings.accessibility.AccessibilityFooterPreference
|
||||||
|
android:key="hearing_device_footer"
|
||||||
|
android:title="@string/accessibility_hearing_device_footer_summary"
|
||||||
|
android:selectable="false"
|
||||||
|
settings:searchable="false" />
|
||||||
|
</PreferenceScreen>
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package com.android.settings.accessibility;
|
package com.android.settings.accessibility;
|
||||||
|
|
||||||
import android.app.settings.SettingsEnums;
|
|
||||||
import android.bluetooth.BluetoothAdapter;
|
import android.bluetooth.BluetoothAdapter;
|
||||||
import android.bluetooth.BluetoothDevice;
|
import android.bluetooth.BluetoothDevice;
|
||||||
import android.bluetooth.BluetoothHapClient;
|
import android.bluetooth.BluetoothHapClient;
|
||||||
@@ -29,6 +28,7 @@ import android.content.Intent;
|
|||||||
import android.content.IntentFilter;
|
import android.content.IntentFilter;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
|
import android.util.FeatureFlagUtils;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
import androidx.annotation.VisibleForTesting;
|
import androidx.annotation.VisibleForTesting;
|
||||||
@@ -129,6 +129,11 @@ public class AccessibilityHearingAidPreferenceController extends BasePreferenceC
|
|||||||
public boolean handlePreferenceTreeClick(Preference preference) {
|
public boolean handlePreferenceTreeClick(Preference preference) {
|
||||||
if (TextUtils.equals(preference.getKey(), getPreferenceKey())) {
|
if (TextUtils.equals(preference.getKey(), getPreferenceKey())) {
|
||||||
final CachedBluetoothDevice device = getConnectedHearingAidDevice();
|
final CachedBluetoothDevice device = getConnectedHearingAidDevice();
|
||||||
|
if (FeatureFlagUtils.isEnabled(mContext,
|
||||||
|
FeatureFlagUtils.SETTINGS_ACCESSIBILITY_HEARING_AID_PAGE)) {
|
||||||
|
launchHearingAidPage();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
if (device == null) {
|
if (device == null) {
|
||||||
launchHearingAidInstructionDialog();
|
launchHearingAidInstructionDialog();
|
||||||
} else {
|
} else {
|
||||||
@@ -295,7 +300,7 @@ public class AccessibilityHearingAidPreferenceController extends BasePreferenceC
|
|||||||
.setDestination(BluetoothDeviceDetailsFragment.class.getName())
|
.setDestination(BluetoothDeviceDetailsFragment.class.getName())
|
||||||
.setArguments(args)
|
.setArguments(args)
|
||||||
.setTitleRes(R.string.device_details_title)
|
.setTitleRes(R.string.device_details_title)
|
||||||
.setSourceMetricsCategory(SettingsEnums.ACCESSIBILITY)
|
.setSourceMetricsCategory(getMetricsCategory())
|
||||||
.launch();
|
.launch();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -304,4 +309,11 @@ public class AccessibilityHearingAidPreferenceController extends BasePreferenceC
|
|||||||
HearingAidDialogFragment fragment = HearingAidDialogFragment.newInstance();
|
HearingAidDialogFragment fragment = HearingAidDialogFragment.newInstance();
|
||||||
fragment.show(mFragmentManager, HearingAidDialogFragment.class.toString());
|
fragment.show(mFragmentManager, HearingAidDialogFragment.class.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void launchHearingAidPage() {
|
||||||
|
new SubSettingLauncher(mContext)
|
||||||
|
.setDestination(AccessibilityHearingAidsFragment.class.getName())
|
||||||
|
.setSourceMetricsCategory(getMetricsCategory())
|
||||||
|
.launch();
|
||||||
|
}
|
||||||
}
|
}
|
@@ -0,0 +1,68 @@
|
|||||||
|
/*
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.accessibility;
|
||||||
|
|
||||||
|
import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
|
||||||
|
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.dashboard.RestrictedDashboardFragment;
|
||||||
|
import com.android.settings.search.BaseSearchIndexProvider;
|
||||||
|
import com.android.settingslib.search.SearchIndexable;
|
||||||
|
|
||||||
|
/** Accessibility settings for hearing aids. */
|
||||||
|
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
|
||||||
|
public class AccessibilityHearingAidsFragment extends RestrictedDashboardFragment {
|
||||||
|
|
||||||
|
private static final String TAG = "AccessibilityHearingAidsFragment";
|
||||||
|
|
||||||
|
public AccessibilityHearingAidsFragment() {
|
||||||
|
super(DISALLOW_CONFIG_BLUETOOTH);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
|
Bundle savedInstanceState) {
|
||||||
|
// TODO(b/237625815): Add shortcutPreference by extending
|
||||||
|
// AccessibilityShortcutPreferenceFragment
|
||||||
|
|
||||||
|
return super.onCreateView(inflater, container, savedInstanceState);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getMetricsCategory() {
|
||||||
|
// TODO(b/262839191): To be updated settings_enums.proto
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected int getPreferenceScreenResId() {
|
||||||
|
return R.xml.accessibility_hearing_aids;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected String getLogTag() {
|
||||||
|
return TAG;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
||||||
|
new BaseSearchIndexProvider(R.xml.accessibility_hearing_aids);
|
||||||
|
}
|
@@ -0,0 +1,54 @@
|
|||||||
|
/*
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.accessibility;
|
||||||
|
|
||||||
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
import androidx.test.core.app.ApplicationProvider;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.testutils.XmlTestUtils;
|
||||||
|
|
||||||
|
import org.junit.Rule;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.junit.MockitoJUnit;
|
||||||
|
import org.mockito.junit.MockitoRule;
|
||||||
|
import org.robolectric.RobolectricTestRunner;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/** Tests for {@link AccessibilityHearingAidsFragment}. */
|
||||||
|
@RunWith(RobolectricTestRunner.class)
|
||||||
|
public class AccessibilityHearingAidsFragmentTest {
|
||||||
|
|
||||||
|
@Rule
|
||||||
|
public MockitoRule mMockitoRule = MockitoJUnit.rule();
|
||||||
|
private final Context mContext = ApplicationProvider.getApplicationContext();
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getNonIndexableKeys_existInXmlLayout() {
|
||||||
|
final List<String> niks = AccessibilityHearingAidsFragment.SEARCH_INDEX_DATA_PROVIDER
|
||||||
|
.getNonIndexableKeys(mContext);
|
||||||
|
final List<String> keys =
|
||||||
|
XmlTestUtils.getKeysFromPreferenceXml(mContext, R.xml.accessibility_hearing_aids);
|
||||||
|
|
||||||
|
assertThat(keys).containsAtLeastElementsIn(niks);
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user