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

[Provider Model] Bring back the "turn on Wi-Fi automatically" option

Browse Source 
- Screenshot:
  https://screenshot.googleplex.com/92uXX6KQCqWxvub

Bug: 182620666
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiWakeupPreferenceControllerTest

Change-Id: Ic0ce47a6d9a374fce9752d67a9c2d083486b9083
This commit is contained in:
Weng Su
2021-03-22 22:27:47 +08:00
parent 34fb874647
commit bec3144c11
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,6 @@ import android.content.IntentFilter;
import android.location.LocationManager; import android.location.LocationManager;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.provider.Settings; import android.provider.Settings;
import android.util.FeatureFlagUtils;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
@@ -45,7 +44,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume;
* {@link TogglePreferenceController} that controls whether the Wi-Fi Wakeup feature should be * {@link TogglePreferenceController} that controls whether the Wi-Fi Wakeup feature should be
* enabled. * enabled.
*/ */
// TODO(b/167474581): Should clean up this controller when Provider Model finished.
public class WifiWakeupPreferenceController extends TogglePreferenceController implements public class WifiWakeupPreferenceController extends TogglePreferenceController implements
LifecycleObserver, OnPause, OnResume { LifecycleObserver, OnPause, OnResume {
@@ -91,9 +89,6 @@ public class WifiWakeupPreferenceController extends TogglePreferenceController i
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) {
return CONDITIONALLY_UNAVAILABLE;
}
return AVAILABLE; return AVAILABLE;
} }