Add audio adjustment fragment in a11y settings
Accessibility settings audio and on-screen text category restructure, add audio adjustment fragment for related accessibility services. Bug: 174829936 Test: atest AudioAdjustmentFragmentTest, atest AccessibilitySettingsTest Change-Id: I8b4397d042a0e7ce1242f95319a6a25cc45f38bb
This commit is contained in:
@@ -5237,6 +5237,8 @@
|
|||||||
<item quantity="one"><xliff:g id="number_device_count">%1$d</xliff:g> saved hearing aid</item>
|
<item quantity="one"><xliff:g id="number_device_count">%1$d</xliff:g> saved hearing aid</item>
|
||||||
<item quantity="other"><xliff:g id="number_device_count">%1$d</xliff:g> saved hearing aids</item>
|
<item quantity="other"><xliff:g id="number_device_count">%1$d</xliff:g> saved hearing aids</item>
|
||||||
</plurals>
|
</plurals>
|
||||||
|
<!-- Title for the accessibility audio adjustment page. [CHAR LIMIT=50] -->
|
||||||
|
<string name="accessibility_audio_adjustment_title">Audio adjustment</string>
|
||||||
|
|
||||||
<!-- Preference's shortcut when enabled. [CHAR LIMIT=NONE] -->
|
<!-- Preference's shortcut when enabled. [CHAR LIMIT=NONE] -->
|
||||||
<string name="accessibility_summary_shortcut_enabled">Shortcut on</string>
|
<string name="accessibility_summary_shortcut_enabled">Shortcut on</string>
|
||||||
|
35
res/xml/accessibility_audio_adjustment.xml
Normal file
35
res/xml/accessibility_audio_adjustment.xml
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Copyright (C) 2021 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_audio_adjustment"
|
||||||
|
android:persistent="false"
|
||||||
|
android:title="@string/accessibility_audio_adjustment_title">
|
||||||
|
|
||||||
|
<SwitchPreference
|
||||||
|
android:key="toggle_primary_mono"
|
||||||
|
android:persistent="false"
|
||||||
|
android:summary="@string/accessibility_toggle_primary_mono_summary"
|
||||||
|
android:title="@string/accessibility_toggle_primary_mono_title"
|
||||||
|
settings:controller="com.android.settings.accessibility.PrimaryMonoPreferenceController"/>
|
||||||
|
|
||||||
|
<com.android.settings.accessibility.BalanceSeekBarPreference
|
||||||
|
android:key="seekbar_primary_balance"
|
||||||
|
android:persistent="false"
|
||||||
|
android:title="@string/accessibility_toggle_primary_balance_title"/>
|
||||||
|
</PreferenceScreen>
|
@@ -100,18 +100,6 @@
|
|||||||
settings:searchable="false"
|
settings:searchable="false"
|
||||||
settings:controller="com.android.settings.accessibility.LiveCaptionPreferenceController"/>
|
settings:controller="com.android.settings.accessibility.LiveCaptionPreferenceController"/>
|
||||||
|
|
||||||
<SwitchPreference
|
|
||||||
android:key="toggle_primary_mono"
|
|
||||||
android:persistent="false"
|
|
||||||
android:summary="@string/accessibility_toggle_primary_mono_summary"
|
|
||||||
android:title="@string/accessibility_toggle_primary_mono_title"
|
|
||||||
settings:controller="com.android.settings.accessibility.PrimaryMonoPreferenceController"/>
|
|
||||||
|
|
||||||
<com.android.settings.accessibility.BalanceSeekBarPreference
|
|
||||||
android:key="seekbar_primary_balance"
|
|
||||||
android:persistent="false"
|
|
||||||
android:title="@string/accessibility_toggle_primary_balance_title"/>
|
|
||||||
|
|
||||||
<Preference
|
<Preference
|
||||||
android:key="hearing_aid_preference"
|
android:key="hearing_aid_preference"
|
||||||
android:persistent="false"
|
android:persistent="false"
|
||||||
@@ -119,6 +107,13 @@
|
|||||||
android:title="@string/accessibility_hearingaid_title"
|
android:title="@string/accessibility_hearingaid_title"
|
||||||
settings:controller="com.android.settings.accessibility.AccessibilityHearingAidPreferenceController"/>
|
settings:controller="com.android.settings.accessibility.AccessibilityHearingAidPreferenceController"/>
|
||||||
|
|
||||||
|
<Preference
|
||||||
|
android:fragment="com.android.settings.accessibility.AudioAdjustmentFragment"
|
||||||
|
android:key="audio_adjustment_preference_screen"
|
||||||
|
android:persistent="false"
|
||||||
|
android:title="@string/accessibility_audio_adjustment_title"
|
||||||
|
settings:searchable="true"/>
|
||||||
|
|
||||||
<Preference
|
<Preference
|
||||||
android:key="rtt_setting"
|
android:key="rtt_setting"
|
||||||
android:summary="@string/summary_placeholder"
|
android:summary="@string/summary_placeholder"
|
||||||
|
@@ -0,0 +1,50 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2021 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.app.settings.SettingsEnums;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.dashboard.DashboardFragment;
|
||||||
|
import com.android.settings.search.BaseSearchIndexProvider;
|
||||||
|
import com.android.settingslib.search.SearchIndexable;
|
||||||
|
|
||||||
|
/** Accessibility settings for audio adjustment. */
|
||||||
|
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
|
||||||
|
public class AudioAdjustmentFragment extends DashboardFragment {
|
||||||
|
|
||||||
|
private static final String TAG = "AudioAdjustmentFragment";
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getMetricsCategory() {
|
||||||
|
return SettingsEnums.ACCESSIBILITY_AUDIO_ADJUSTMENT;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected int getPreferenceScreenResId() {
|
||||||
|
return R.xml.accessibility_audio_adjustment;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected String getLogTag() {
|
||||||
|
return TAG;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
||||||
|
new BaseSearchIndexProvider(R.xml.accessibility_audio_adjustment);
|
||||||
|
|
||||||
|
}
|
@@ -0,0 +1,50 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2021 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.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.robolectric.RobolectricTestRunner;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/** Tests for {@link AudioAdjustmentFragment}. */
|
||||||
|
@RunWith(RobolectricTestRunner.class)
|
||||||
|
public class AudioAdjustmentFragmentTest {
|
||||||
|
|
||||||
|
private Context mContext = ApplicationProvider.getApplicationContext();
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getNonIndexableKeys_existInXmlLayout() {
|
||||||
|
final List<String> niks = AudioAdjustmentFragment.SEARCH_INDEX_DATA_PROVIDER
|
||||||
|
.getNonIndexableKeys(mContext);
|
||||||
|
final List<String> keys =
|
||||||
|
XmlTestUtils.getKeysFromPreferenceXml(mContext,
|
||||||
|
R.xml.accessibility_audio_adjustment);
|
||||||
|
|
||||||
|
assertThat(keys).containsAtLeastElementsIn(niks);
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user