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

Merge "Hide toggle to Turn on Wi-Fi automatically preference in Search settings"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-09-01 09:32:05 +00:00
committed by Android (Google) Code Review
parent 4d6e33e3e8 59403ef3f2
commit 52892dad16
2 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/wifi/WifiWakeupPreferenceController.java
View File

@@ -89,6 +89,13 @@ public class WifiWakeupPreferenceController extends TogglePreferenceController i
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
// Since mFragment is set only when entering Network preferences settings. So when
// mFragment == null, we can assume that the object is created by Search settings.
// When Search settings is called, if the dependent condition is not enabled, then
// return DISABLED_DEPENDENT_SETTING to hide the toggle.
if (mFragment == null && (!getLocationEnabled() || !getWifiScanningEnabled())) {
return DISABLED_DEPENDENT_SETTING;
}
return AVAILABLE; return AVAILABLE;
} }
@@ -96,7 +103,7 @@ public class WifiWakeupPreferenceController extends TogglePreferenceController i
public boolean isChecked() { public boolean isChecked() {
return getWifiWakeupEnabled() return getWifiWakeupEnabled()
&& getWifiScanningEnabled() && getWifiScanningEnabled()
&& mLocationManager.isLocationEnabled(); && getLocationEnabled();
} }
@Override @Override
@@ -106,7 +113,7 @@ public class WifiWakeupPreferenceController extends TogglePreferenceController i
throw new IllegalStateException("No fragment to start activity"); throw new IllegalStateException("No fragment to start activity");
} }
if (!mLocationManager.isLocationEnabled()) { if (!getLocationEnabled()) {
final Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS); final Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
mFragment.startActivityForResult(intent, WIFI_WAKEUP_REQUEST_CODE); mFragment.startActivityForResult(intent, WIFI_WAKEUP_REQUEST_CODE);
return false; return false;
@@ -128,7 +135,7 @@ public class WifiWakeupPreferenceController extends TogglePreferenceController i
@Override @Override
public CharSequence getSummary() { public CharSequence getSummary() {
if (!mLocationManager.isLocationEnabled()) { if (!getLocationEnabled()) {
return getNoLocationSummary(); return getNoLocationSummary();
} else { } else {
return mContext.getText(R.string.wifi_wakeup_summary); return mContext.getText(R.string.wifi_wakeup_summary);
@@ -151,12 +158,16 @@ public class WifiWakeupPreferenceController extends TogglePreferenceController i
if (requestCode != WIFI_WAKEUP_REQUEST_CODE) { if (requestCode != WIFI_WAKEUP_REQUEST_CODE) {
return; return;
} }
if (mLocationManager.isLocationEnabled() && getWifiScanningEnabled()) { if (getLocationEnabled() && getWifiScanningEnabled()) {
setWifiWakeupEnabled(true); setWifiWakeupEnabled(true);
updateState(mPreference); updateState(mPreference);
} }
} }
private boolean getLocationEnabled() {
return mLocationManager.isLocationEnabled();
}
private boolean getWifiScanningEnabled() { private boolean getWifiScanningEnabled() {
return mWifiManager.isScanAlwaysAvailable(); return mWifiManager.isScanAlwaysAvailable();
} }

26
tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
View File

@@ -16,6 +16,9 @@
package com.android.settings.wifi; package com.android.settings.wifi;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
@@ -68,6 +71,29 @@ public class WifiWakeupPreferenceControllerTest {
doReturn(true).when(mLocationManager).isLocationEnabled(); doReturn(true).when(mLocationManager).isLocationEnabled();
} }
@Test
public void getAvailabilityStatus_fragmentIsNotNull_returnAvailable() {
mController.setFragment(mFragment);
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
@Test
public void getAvailabilityStatus_fragmentIsNullAndLocationDisabled_returnDisabled() {
mController.setFragment(null);
when(mLocationManager.isLocationEnabled()).thenReturn(false);
assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_DEPENDENT_SETTING);
}
@Test
public void getAvailabilityStatus_fragmentIsNullAndWifiScanDisabled_returnDisabled() {
mController.setFragment(null);
when(mWifiManager.isScanAlwaysAvailable()).thenReturn(false);
assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_DEPENDENT_SETTING);
}
@Test @Test
public void setChecked_scanEnableLocationEnable_wifiWakeupEnable() { public void setChecked_scanEnableLocationEnable_wifiWakeupEnable() {
when(mWifiManager.isAutoWakeupEnabled()).thenReturn(false); when(mWifiManager.isAutoWakeupEnabled()).thenReturn(false);