[Provider Model] Preferences Settings UI change

- Change the title from “Wi-Fi preference” to “Preferences”
- Change the summary from “Wi-Fi turns back on automatically” to
“Connect to public networks”
- Remove “Turn on Wi-Fi automatically” preference
- Screenshot:
  https://screenshot.googleplex.com/Areywyb46deK9VQ
  https://screenshot.googleplex.com/6H5Z4PxA5tWXZ6S

Bug: 172788645
Test: manual test
Change-Id: Ibce21f1d740a139b407a0a9a41f2cb4c4e34776c
This commit is contained in:
Weng Su
2020-11-15 08:45:50 +00:00
parent 5816d414db
commit 6bf7b1a72f
5 changed files with 31 additions and 6 deletions

View File

@@ -21,6 +21,8 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.util.FeatureFlagUtils;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -42,6 +44,14 @@ public class ConfigureWifiSettings extends DashboardFragment {
private WifiWakeupPreferenceController mWifiWakeupPreferenceController;
private UseOpenWifiPreferenceController mUseOpenWifiPreferenceController;
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) {
getActivity().setTitle(R.string.network_and_internet_preferences_title);
}
}
@Override
public int getMetricsCategory() {
return SettingsEnums.CONFIGURE_WIFI;
@@ -54,7 +64,10 @@ public class ConfigureWifiSettings extends DashboardFragment {
@Override
public int getInitialExpandedChildCount() {
int tileLimit = 2;
int tileLimit = 1;
if (mWifiWakeupPreferenceController.isAvailable()) {
tileLimit++;
}
if (mUseOpenWifiPreferenceController.isAvailable()) {
tileLimit++;
}