PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enhanced Connectivity Enabled Default" into rvc-dev am: 75f0bdb400 am: d19b162a1b am: fd60c1bee3

Browse Source 
Change-Id: I625db0e64a2517ec30bfc48d439c78bb76c21a89
This commit is contained in:
Blake Kragten
2020-03-18 22:29:05 +00:00
committed by Automerger Merge Worker
parent d7c504b396 fd60c1bee3
commit 054662536a
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/development/EnhancedConnectivityPreferenceController.java
View File

@@ -37,7 +37,7 @@ public class EnhancedConnectivityPreferenceController extends
@VisibleForTesting
static final int ENHANCED_CONNECTIVITY_ON = 1;
// default is enhanced connectivity disabled.
// default is enhanced connectivity enabled.
@VisibleForTesting
static final int ENHANCED_CONNECTIVITY_OFF = 0;
@@ -65,7 +65,7 @@ public class EnhancedConnectivityPreferenceController extends
public void updateState(Preference preference) {
final int enhancedConnectivityEnabled = Settings.Global.getInt(
mContext.getContentResolver(), Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
ENHANCED_CONNECTIVITY_OFF);
ENHANCED_CONNECTIVITY_ON);
((SwitchPreference) mPreference).setChecked(
enhancedConnectivityEnabled == ENHANCED_CONNECTIVITY_ON);
}
@@ -75,7 +75,7 @@ public class EnhancedConnectivityPreferenceController extends
super.onDeveloperOptionsSwitchDisabled();
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
ENHANCED_CONNECTIVITY_OFF);
((SwitchPreference) mPreference).setChecked(false);
ENHANCED_CONNECTIVITY_ON);
((SwitchPreference) mPreference).setChecked(true);
}
}

12
tests/robotests/src/com/android/settings/development/EnhancedConnectivityPreferenceControllerTest.java
View File

@@ -88,20 +88,20 @@ public class EnhancedConnectivityPreferenceControllerTest {
}
@Test
public void onDeveloperOptionsDisabled_shouldDisablePreference() {
mController.onDeveloperOptionsDisabled();
public void onDeveloperOptionsDisabled_shouldEnablePreference() {
mController.onDeveloperOptionsSwitchDisabled();
verify(mPreference).setEnabled(false);
verify(mPreference).setChecked(false);
verify(mPreference).setChecked(true);
assertThat(isSettingEnabled()).isFalse();
assertThat(isSettingEnabled()).isTrue();
}
private boolean isSettingEnabled() {
return Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
EnhancedConnectivityPreferenceController.ENHANCED_CONNECTIVITY_OFF
/* default off */)
EnhancedConnectivityPreferenceController.ENHANCED_CONNECTIVITY_ON
/* default on */)
== EnhancedConnectivityPreferenceController.ENHANCED_CONNECTIVITY_ON;
}
}