diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 53c3aad507d..92ce418da4f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -2860,8 +2860,8 @@
"データ使用量の警告の設定"
"データ使用量の上限の設定"
"データ使用量の上限の設定"
- "タブレットで設定した上限に達するとモバイルデータが OFF になります。\n\nデータ使用量はタブレットで測定された値ですが、携帯通信会社による測定結果とは異なることがあるため、余裕をもって上限を設定することをおすすめします。"
- "スマートフォンで設定した上限に達するとモバイルデータが OFF になります。\n\nデータ使用量はスマートフォンで測定された値ですが、携帯通信会社による測定結果とは異なることがあるため、余裕をもって上限を設定することをおすすめします。"
+ "タブレットで設定した上限に達するとモバイルデータが OFF になります。\n\nデータ使用量はタブレットで測定された値ですが、携帯通信会社での使用量の計算はこれと異なることがあるため、余裕をもって上限を設定することをおすすめします。"
+ "スマートフォンで設定した上限に達するとモバイルデータが OFF になります。\n\nデータ使用量はスマートフォンで測定された値ですが、携帯通信会社での使用量の計算はこれと異なることがあるため、余裕をもって上限を設定することをおすすめします。"
"バックグラウンドデータを制限しますか？"
"バックグラウンドのモバイルデータを制限すると、アプリやサービスによっては、Wi-Fi 未接続時に機能しない場合があります。"
"バックグラウンドのモバイルデータを制限すると、アプリやサービスによっては、Wi‑Fi 未接続時に機能しない場合があります。\n\nこの設定はこのタブレット上のすべてのユーザーに影響します。"
diff --git a/res/values/config.xml b/res/values/config.xml
index 746d3e7d85e..fa4bc93d456 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -457,9 +457,6 @@
false
-
- false
-
false
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 97462bb942c..454336044e9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2753,7 +2753,7 @@
Automatically raises the refresh rate from 60 to 90 Hz for some content. Increases battery usage.
- Smooth Display
+ Force 90 Hz refresh rate
Highest refresh rate for improved touch responsiveness & animation quality. Increases battery usage.
@@ -3054,8 +3054,6 @@
Android security update
Model
-
- Model: %1$s
Model & hardware
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 746a51c4b9d..6f9405e7e12 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -297,11 +297,6 @@
android:title="@string/mobile_data_always_on"
android:summary="@string/mobile_data_always_on_summary" />
-
-
{
final Message msg = mHandler.obtainMessage(
EVENT_SET_NETWORK_SELECTION_MANUALLY_DONE);
msg.obj = mTelephonyManager.setNetworkSelectionModeManual(
- operatorNumeric, true /* persistSelection */);
+ operator, true /* persistSelection */);
msg.sendToTarget();
});
}
diff --git a/src/com/android/settings/widget/SeekBarPreference.java b/src/com/android/settings/widget/SeekBarPreference.java
index bdd1ba94474..ac2838271c4 100644
--- a/src/com/android/settings/widget/SeekBarPreference.java
+++ b/src/com/android/settings/widget/SeekBarPreference.java
@@ -51,6 +51,7 @@ public class SeekBarPreference extends RestrictedPreference
private boolean mShouldBlink;
private int mAccessibilityRangeInfoType = AccessibilityNodeInfo.RangeInfo.RANGE_TYPE_INT;
private CharSequence mSeekBarContentDescription;
+ private CharSequence mSeekBarStateDescription;
public SeekBarPreference(
Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
@@ -124,6 +125,9 @@ public class SeekBarPreference extends RestrictedPreference
} else if (!TextUtils.isEmpty(title)) {
mSeekBar.setContentDescription(title);
}
+ if (!TextUtils.isEmpty(mSeekBarStateDescription)) {
+ mSeekBar.setStateDescription(mSeekBarStateDescription);
+ }
if (mSeekBar instanceof DefaultIndicatorSeekBar) {
((DefaultIndicatorSeekBar) mSeekBar).setDefaultProgress(mDefaultProgress);
}
@@ -304,6 +308,18 @@ public class SeekBarPreference extends RestrictedPreference
}
}
+ /**
+ * Specify the state description for this seek bar represents.
+ *
+ * @param stateDescription the state description of seek bar
+ */
+ public void setSeekBarStateDescription(CharSequence stateDescription) {
+ mSeekBarStateDescription = stateDescription;
+ if (mSeekBar != null) {
+ mSeekBar.setStateDescription(stateDescription);
+ }
+ }
+
@Override
protected Parcelable onSaveInstanceState() {
/*
diff --git a/tests/robotests/src/com/android/settings/development/EnhancedConnectivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnhancedConnectivityPreferenceControllerTest.java
deleted file mode 100644
index db0b0db2dcc..00000000000
--- a/tests/robotests/src/com/android/settings/development/EnhancedConnectivityPreferenceControllerTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (C) 2020 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.development;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.provider.Settings;
-
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
-import com.android.settings.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class EnhancedConnectivityPreferenceControllerTest {
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Context mContext;
-
- @Mock
- private SwitchPreference mPreference;
- @Mock
- private PreferenceScreen mPreferenceScreen;
-
- private EnhancedConnectivityPreferenceController mController;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mController = new EnhancedConnectivityPreferenceController(mContext);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
- .thenReturn(mPreference);
- mController.displayPreference(mPreferenceScreen);
- }
-
- @Test
- public void onPreferenceChanged_enhanceConnectivity_shouldBeOn() {
- mController.onPreferenceChange(mPreference, true /* new value */);
-
- assertThat(isSettingEnabled()).isTrue();
- }
-
- @Test
- public void onPreferenceChanged_enhanceConnectivity_shouldBeOff() {
- mController.onPreferenceChange(mPreference, false /* new value */);
-
- assertThat(isSettingEnabled()).isFalse();
- }
-
- @Test
- public void updateState_preferenceShouldBeChecked() {
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.ENHANCED_CONNECTIVITY_ENABLED, 1 /* enabled */);
- mController.updateState(mPreference);
-
- verify(mPreference).setChecked(true);
- }
-
- @Test
- public void updateState_preferenceShouldNotBeChecked() {
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.ENHANCED_CONNECTIVITY_ENABLED, 0 /* disabled */);
- mController.updateState(mPreference);
-
- verify(mPreference).setChecked(false);
- }
-
- @Test
- public void onDeveloperOptionsDisabled_shouldEnablePreference() {
- mController.onDeveloperOptionsSwitchDisabled();
-
- verify(mPreference).setEnabled(false);
- verify(mPreference).setChecked(true);
-
- assertThat(isSettingEnabled()).isTrue();
- }
-
- @Test
- public void isAvailable_enhancedConnectivityShown_shouldReturnTrue() {
- enableEnhancedConnectivityPreference(true);
-
- boolean availability = mController.isAvailable();
-
- assertThat(availability).isTrue();
- }
-
- @Test
- public void isAvailable_enhancedConnectivityNotShown_shouldReturnFalse() {
- enableEnhancedConnectivityPreference(false);
-
- boolean availability = mController.isAvailable();
-
- assertThat(availability).isFalse();
- }
-
- private void enableEnhancedConnectivityPreference(boolean enable) {
- when(mContext.getResources().getBoolean(R.bool.config_show_enhanced_connectivity))
- .thenReturn(enable);
- }
-
- private boolean isSettingEnabled() {
- return Settings.Global.getInt(mContext.getContentResolver(),
- Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
- EnhancedConnectivityPreferenceController.ENHANCED_CONNECTIVITY_ON
- /* default on */)
- == EnhancedConnectivityPreferenceController.ENHANCED_CONNECTIVITY_ON;
- }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoPreferenceControllerTest.java
index 291f6e28fe8..c7c7669c86e 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoPreferenceControllerTest.java
@@ -24,7 +24,6 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.deviceinfo.HardwareInfoPreferenceController;
@@ -79,8 +78,6 @@ public class HardwareInfoPreferenceControllerTest {
}
private boolean containBuildModel(CharSequence result) {
- final String oracle = mContext.getResources().getString(R.string.model_summary,
- Build.MODEL);
- return result.toString().contains(oracle);
+ return result.toString().contains(Build.MODEL);
}
}
diff --git a/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java
index f7dea225236..42ed0746417 100644
--- a/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java
@@ -19,6 +19,7 @@ package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
@@ -110,6 +111,13 @@ public class SeekBarPreferenceTest {
assertThat(seekBarPreference.isSelectable()).isTrue();
}
+ @Test
+ public void testSetSeekBarStateDescription() {
+ mSeekBarPreference.setSeekBarStateDescription("test");
+
+ verify(mSeekBarPreference).setSeekBarStateDescription("test");
+ }
+
public static class TestFragment extends PreferenceFragmentCompat {
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {