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

Enhanced Connectivity Dev Toggle

Browse Source 
Add Enhanced Connectivity Developer option switch. This switch will
allow the connectivity thermal power manager to actively shutoff 5G in
order to save power when cellular throughput is below the set threshold.

ScreenShots: https://drive.google.com/drive/folders/109VTTXqIn5Teg6daHpNHV7z13MmEEb7Q?usp=sharing

Bug: 147305171
Test: make RunSettingsRoboTests ROBOTEST_FILTER=EnhancedConnectivityPreferenceControllerTest
Test: On-device using developer option menu

Change-Id: I311cfcadb8325db30ff4917959414b5a7d108bcc
This commit is contained in:
Blake Kragten
2020-01-28 13:45:13 -08:00
parent d4e2f78d9a
commit 79b0315be6
4 changed files with 194 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/development_settings.xml
View File

@@ -263,6 +263,11 @@
android:title="@string/mobile_data_always_on"
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"

1
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -468,6 +468,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
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));

81
src/com/android/settings/development/EnhancedConnectivityPreferenceController.java Normal file
View File

@@ -0,0 +1,81 @@
/*
* 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.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 disabled.
@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_OFF);
((SwitchPreference) mPreference).setChecked(
enhancedConnectivityEnabled == ENHANCED_CONNECTIVITY_ON);
}
@Override
protected void onDeveloperOptionsSwitchDisabled() {
super.onDeveloperOptionsSwitchDisabled();
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
ENHANCED_CONNECTIVITY_OFF);
((SwitchPreference) mPreference).setChecked(false);
}
}

107
tests/robotests/src/com/android/settings/development/EnhancedConnectivityPreferenceControllerTest.java Normal file
View File

@@ -0,0 +1,107 @@
/*
* 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 org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class)
public class EnhancedConnectivityPreferenceControllerTest {
@Mock
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_shouldDisablePreference() {
mController.onDeveloperOptionsDisabled();
verify(mPreference).setEnabled(false);
verify(mPreference).setChecked(false);
assertThat(isSettingEnabled()).isFalse();
}
private boolean isSettingEnabled() {
return Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
EnhancedConnectivityPreferenceController.ENHANCED_CONNECTIVITY_OFF
/* default off */)
== EnhancedConnectivityPreferenceController.ENHANCED_CONNECTIVITY_ON;
}
}