Merge "Support EXTRA_DEVICE_PASSWORD_REQUIREMENT_ONLY"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 34b4041..114b41c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5239,6 +5239,8 @@
<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>
</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] -->
<string name="accessibility_summary_shortcut_enabled">Shortcut on</string>
diff --git a/res/xml/accessibility_audio_adjustment.xml b/res/xml/accessibility_audio_adjustment.xml
new file mode 100644
index 0000000..c38b4ad
--- /dev/null
+++ b/res/xml/accessibility_audio_adjustment.xml
@@ -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>
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index b7c28b4..36125b3 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -100,18 +100,6 @@
settings:searchable="false"
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
android:key="hearing_aid_preference"
android:persistent="false"
@@ -120,6 +108,13 @@
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
android:key="rtt_setting"
android:summary="@string/summary_placeholder"
android:title="@string/rtt_settings_title"
diff --git a/src/com/android/settings/accessibility/AudioAdjustmentFragment.java b/src/com/android/settings/accessibility/AudioAdjustmentFragment.java
new file mode 100644
index 0000000..c80216b
--- /dev/null
+++ b/src/com/android/settings/accessibility/AudioAdjustmentFragment.java
@@ -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);
+
+}
diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java
index 054e3d9..ff5de3e 100644
--- a/src/com/android/settings/network/SubscriptionUtil.java
+++ b/src/com/android/settings/network/SubscriptionUtil.java
@@ -324,6 +324,23 @@
return displayNames.getOrDefault(subscriptionId, "");
}
+ /**
+ * Return the display name for a subscription, which is guaranteed to be unique.
+ * The logic to create this name has the following order of operations:
+ * 1) If the original display name is not unique, the last four digits of the phone number
+ * will be appended.
+ * 2) If the phone number is not visible or the last four digits are shared with another
+ * subscription, the subscription id will be appended to the original display name.
+ * More details can be found at go/unique-sub-display-names.
+ *
+ * @return map of active subscription ids to diaplay names.
+ */
+ @VisibleForTesting
+ public static CharSequence getUniqueSubscriptionDisplayName(
+ SubscriptionInfo info, Context context) {
+ return getUniqueSubscriptionDisplayName(info.getSubscriptionId(), context);
+ }
+
public static String getDisplayName(SubscriptionInfo info) {
final CharSequence name = info.getDisplayName();
if (name != null) {
diff --git a/tests/robotests/src/com/android/settings/accessibility/AudioAdjustmentFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/AudioAdjustmentFragmentTest.java
new file mode 100644
index 0000000..814736d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/AudioAdjustmentFragmentTest.java
@@ -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);
+ }
+}
diff --git a/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java b/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java
index 85ac011..b36675a 100644
--- a/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java
+++ b/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java
@@ -361,6 +361,26 @@
}
@Test
+ public void getUniqueDisplayName_fullSubscriptionInfo_correctNameReturned() {
+ // Each subscription's default display name is unique.
+ final SubscriptionInfo info1 = mock(SubscriptionInfo.class);
+ when(info1.getSubscriptionId()).thenReturn(SUBID_1);
+ when(info1.getDisplayName()).thenReturn(CARRIER_1);
+ when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(
+ Arrays.asList(info1));
+
+ TelephonyManager sub1Telmgr = mock(TelephonyManager.class);
+ when(sub1Telmgr.getLine1Number()).thenReturn("1112223333");
+ when(mTelMgr.createForSubscriptionId(SUBID_1)).thenReturn(sub1Telmgr);
+
+ final CharSequence name =
+ SubscriptionUtil.getUniqueSubscriptionDisplayName(info1, mContext);
+
+ assertThat(name).isNotNull();
+ assertEquals(CARRIER_1, name);
+ }
+
+ @Test
public void isInactiveInsertedPSim_nullSubInfo_doesNotCrash() {
assertThat(SubscriptionUtil.isInactiveInsertedPSim(null)).isFalse();
}