Merge "[Wi-Fi] Remove 'Do not validate' option in CA certificate spinner" into rvc-qpr-dev
diff --git a/res/values/config.xml b/res/values/config.xml
index 746d3e7..fa4bc93 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -457,9 +457,6 @@
<!-- Whether nfc detection point preview image is available or not. -->
<bool name="config_nfc_detection_point">false</bool>
- <!-- Whether to show Enhanced Connectivity switch in Developer Options -->
- <bool name="config_show_enhanced_connectivity">false</bool>
-
<!-- Whether to show Smooth Display feature in Settings Options -->
<bool name="config_show_smooth_display">false</bool>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 56fd5c0..11a38f6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2755,7 +2755,7 @@
<!-- Display settings screen, peak refresh rate settings summary [CHAR LIMIT=NONE] -->
<string name="peak_refresh_rate_summary">Automatically raises the refresh rate from 60 to 90 Hz for some content. Increases battery usage.</string>
<!-- Display developer settings: Force to the highest refresh rate [CHAR LIMIT=NONE] -->
- <string name="force_high_refresh_rate_toggle">Smooth Display</string>
+ <string name="force_high_refresh_rate_toggle">Force 90 Hz refresh rate</string>
<!-- Display developer settings: Force to the highest refresh rate description [CHAR LIMIT=NONE]-->
<string name="force_high_refresh_rate_desc">Highest refresh rate for improved touch responsiveness & animation quality. Increases battery usage.</string>
<!-- Display settings screen, setting option name to enable adaptive sleep [CHAR LIMIT=30] -->
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 746a51c..6f9405e 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -298,11 +298,6 @@
android:summary="@string/mobile_data_always_on_summary" />
<SwitchPreference
- android:key="enhanced_connectivity"
- android:title="@string/enhanced_connectivity"
- android:summary="@string/enhanced_connectivity_summary" />
-
- <SwitchPreference
android:key="tethering_hardware_offload"
android:title="@string/tethering_hardware_offload"
android:summary="@string/tethering_hardware_offload_summary" />
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 945970e..f2d60f1 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -479,7 +479,6 @@
controllers.add(new BluetoothMapVersionPreferenceController(context));
controllers.add(new BluetoothA2dpHwOffloadPreferenceController(context, fragment));
controllers.add(new BluetoothMaxConnectedAudioDevicesPreferenceController(context));
- controllers.add(new EnhancedConnectivityPreferenceController(context));
controllers.add(new ShowTapsPreferenceController(context));
controllers.add(new PointerLocationPreferenceController(context));
controllers.add(new ShowSurfaceUpdatesPreferenceController(context));
diff --git a/src/com/android/settings/development/EnhancedConnectivityPreferenceController.java b/src/com/android/settings/development/EnhancedConnectivityPreferenceController.java
deleted file mode 100644
index 54cfdc6..0000000
--- a/src/com/android/settings/development/EnhancedConnectivityPreferenceController.java
+++ /dev/null
@@ -1,87 +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 android.content.Context;
-import android.provider.Settings;
-
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
-import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
-/**
- * Preference controller for Enhanced Connectivity feature
- */
-public class EnhancedConnectivityPreferenceController extends
- DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
- PreferenceControllerMixin {
-
- private static final String ENHANCED_CONNECTIVITY_KEY = "enhanced_connectivity";
-
- @VisibleForTesting
- static final int ENHANCED_CONNECTIVITY_ON = 1;
- // default is enhanced connectivity enabled.
- @VisibleForTesting
- static final int ENHANCED_CONNECTIVITY_OFF = 0;
-
- public EnhancedConnectivityPreferenceController(Context context) {
- super(context);
- }
-
- @Override
- public boolean onPreferenceChange(Preference preference, Object o) {
- final boolean isEnabled = (Boolean) o;
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
- isEnabled
- ? ENHANCED_CONNECTIVITY_ON
- : ENHANCED_CONNECTIVITY_OFF);
- return true;
- }
-
- @Override
- public String getPreferenceKey() {
- return ENHANCED_CONNECTIVITY_KEY;
- }
-
- @Override
- public void updateState(Preference preference) {
- final int enhancedConnectivityEnabled = Settings.Global.getInt(
- mContext.getContentResolver(), Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
- ENHANCED_CONNECTIVITY_ON);
- ((SwitchPreference) mPreference).setChecked(
- enhancedConnectivityEnabled == ENHANCED_CONNECTIVITY_ON);
- }
-
- @Override
- public boolean isAvailable() {
- return mContext.getResources().getBoolean(R.bool.config_show_enhanced_connectivity);
- }
-
- @Override
- protected void onDeveloperOptionsSwitchDisabled() {
- super.onDeveloperOptionsSwitchDisabled();
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
- ENHANCED_CONNECTIVITY_ON);
- ((SwitchPreference) mPreference).setChecked(true);
- }
-}
diff --git a/src/com/android/settings/sim/SimSelectNotification.java b/src/com/android/settings/sim/SimSelectNotification.java
index ae36f35..6bd4c24 100644
--- a/src/com/android/settings/sim/SimSelectNotification.java
+++ b/src/com/android/settings/sim/SimSelectNotification.java
@@ -20,6 +20,7 @@
import static android.provider.Settings.ENABLE_MMS_DATA_REQUEST_REASON_OUTGOING_MMS;
import static android.provider.Settings.EXTRA_ENABLE_MMS_DATA_REQUEST_REASON;
import static android.provider.Settings.EXTRA_SUB_ID;
+import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
import static android.telephony.TelephonyManager.EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE;
import static android.telephony.TelephonyManager.EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_ALL;
import static android.telephony.TelephonyManager.EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DATA;
@@ -209,6 +210,7 @@
.setContentText(resources.getText(R.string.sim_notification_summary))
.setAutoCancel(true);
Intent resultIntent = new Intent(Settings.ACTION_WIRELESS_SETTINGS);
+ resultIntent.setPackage(SETTINGS_PACKAGE_NAME);
resultIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
PendingIntent resultPendingIntent = PendingIntent.getActivity(context, 0, resultIntent,
PendingIntent.FLAG_CANCEL_CURRENT);
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 db0b0db..0000000
--- 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;
- }
-}