Refactor WifiWakeupPreferenceController into TogglePreferenceController

WifiWakeupPreferenceController is essentially reimplementing TogglePreferenceController.

Add below 2 changes for test failure of CodeInspectionTest

1. Remove some arguments from constructor of the controller
2. Declare the controller in xml instead of in code

Bug: 132391311
Test: manual
      WifiWakeupPreferenceControllerTest

Change-Id: I4aa607f78d5e7de70600a410dfc7267e6bd7d387
This commit is contained in:
Arc Wang
2019-05-15 17:44:03 +08:00
parent 6a87c5c4f5
commit 1ee4adf321
4 changed files with 59 additions and 91 deletions

View File

@@ -25,7 +25,6 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.location.LocationManager;
import android.provider.Settings;
import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
@@ -34,108 +33,94 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.utils.AnnotationSpan;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
/**
* {@link PreferenceControllerMixin} that controls whether the Wi-Fi Wakeup feature should be
* {@link TogglePreferenceController} that controls whether the Wi-Fi Wakeup feature should be
* enabled.
*/
public class WifiWakeupPreferenceController extends AbstractPreferenceController implements
public class WifiWakeupPreferenceController extends TogglePreferenceController implements
LifecycleObserver, OnPause, OnResume {
private static final String TAG = "WifiWakeupPrefController";
private static final String KEY_ENABLE_WIFI_WAKEUP = "enable_wifi_wakeup";
private final Fragment mFragment;
private Fragment mFragment;
@VisibleForTesting
SwitchPreference mPreference;
@VisibleForTesting
LocationManager mLocationManager;
private final BroadcastReceiver mLocationReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
updateState(mPreference);
}
};
private final IntentFilter mLocationFilter =
new IntentFilter(LocationManager.MODE_CHANGED_ACTION);
public WifiWakeupPreferenceController(Context context, DashboardFragment fragment,
Lifecycle lifecycle) {
super(context);
mFragment = fragment;
public WifiWakeupPreferenceController(Context context) {
super(context, KEY_ENABLE_WIFI_WAKEUP);
mLocationManager = (LocationManager) context.getSystemService(Service.LOCATION_SERVICE);
lifecycle.addObserver(this);
}
public void setFragment(Fragment hostFragment) {
mFragment = hostFragment;
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreference = screen.findPreference(KEY_ENABLE_WIFI_WAKEUP);
updateState(mPreference);
mPreference = screen.findPreference(getPreferenceKey());
}
@Override
public boolean isAvailable() {
return true;
public int getAvailabilityStatus() {
return AVAILABLE;
}
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
if (!TextUtils.equals(preference.getKey(), KEY_ENABLE_WIFI_WAKEUP)) {
return false;
}
if (!(preference instanceof SwitchPreference)) {
return false;
}
public boolean isChecked() {
return getWifiWakeupEnabled()
&& getWifiScanningEnabled()
&& mLocationManager.isLocationEnabled();
}
// TODO(b/132391311): WifiWakeupPreferenceController is essentially reimplementing
// TogglePreferenceController. Refactor it into TogglePreferenceController.
@Override
public boolean setChecked(boolean isChecked) {
if (isChecked) {
if (mFragment == null) {
throw new IllegalStateException("No fragment to start activity");
}
// Toggle wifi-wakeup setting between 1/0 based on its current state, and some other checks.
if (isWifiWakeupAvailable()) {
setWifiWakeupEnabled(false);
} else {
if (!mLocationManager.isLocationEnabled()) {
final Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
mFragment.startActivityForResult(intent, WIFI_WAKEUP_REQUEST_CODE);
return true;
return false;
} else if (!getWifiScanningEnabled()) {
showScanningDialog();
} else {
setWifiWakeupEnabled(true);
return false;
}
}
updateState(mPreference);
setWifiWakeupEnabled(isChecked);
return true;
}
@Override
public String getPreferenceKey() {
return KEY_ENABLE_WIFI_WAKEUP;
}
@Override
public void updateState(Preference preference) {
if (!(preference instanceof SwitchPreference)) {
return;
}
final SwitchPreference enableWifiWakeup = (SwitchPreference) preference;
enableWifiWakeup.setChecked(isWifiWakeupAvailable());
public CharSequence getSummary() {
if (!mLocationManager.isLocationEnabled()) {
preference.setSummary(getNoLocationSummary());
return getNoLocationSummary();
} else {
preference.setSummary(R.string.wifi_wakeup_summary);
return mContext.getText(R.string.wifi_wakeup_summary);
}
}
@@ -152,8 +137,8 @@ public class WifiWakeupPreferenceController extends AbstractPreferenceController
}
if (mLocationManager.isLocationEnabled() && getWifiScanningEnabled()) {
setWifiWakeupEnabled(true);
updateState(mPreference);
}
updateState(mPreference);
}
private boolean getWifiScanningEnabled() {
@@ -173,15 +158,6 @@ public class WifiWakeupPreferenceController extends AbstractPreferenceController
Settings.Global.WIFI_WAKEUP_ENABLED, 0) == 1;
}
/**
* Wifi wakeup is available only when both location and Wi-Fi scanning are enabled.
*/
private boolean isWifiWakeupAvailable() {
return getWifiWakeupEnabled()
&& getWifiScanningEnabled()
&& mLocationManager.isLocationEnabled();
}
private void setWifiWakeupEnabled(boolean enabled) {
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WIFI_WAKEUP_ENABLED,
enabled ? 1 : 0);