From 6bf7b1a72f1520bfa228fc9cc6a9bd84112ad9ab Mon Sep 17 00:00:00 2001 From: Weng Su Date: Sun, 15 Nov 2020 08:45:50 +0000 Subject: [PATCH] [Provider Model] Preferences Settings UI change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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 --- res/values/strings.xml | 4 ++++ res/xml/network_provider_settings.xml | 3 ++- .../settings/network/NetworkProviderSettings.java | 10 ++++++---- .../settings/wifi/ConfigureWifiSettings.java | 15 ++++++++++++++- .../wifi/WifiWakeupPreferenceController.java | 5 +++++ 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 5691b3a05c9..28908d7cd34 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -12429,6 +12429,10 @@ Calls SMS + + Preferences + + Connect to public networks Unavailable because bedtime mode is on diff --git a/res/xml/network_provider_settings.xml b/res/xml/network_provider_settings.xml index 2af2e91f546..a3fecf62f7a 100644 --- a/res/xml/network_provider_settings.xml +++ b/res/xml/network_provider_settings.xml @@ -33,7 +33,8 @@ diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java index 5a42a5ae829..df62190b7ee 100644 --- a/src/com/android/settings/network/NetworkProviderSettings.java +++ b/src/com/android/settings/network/NetworkProviderSettings.java @@ -828,10 +828,12 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment @VisibleForTesting void setAdditionalSettingsSummaries() { - mConfigureWifiSettingsPreference.setSummary(getString( - isWifiWakeupEnabled() - ? R.string.wifi_configure_settings_preference_summary_wakeup_on - : R.string.wifi_configure_settings_preference_summary_wakeup_off)); + if (!FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) { + mConfigureWifiSettingsPreference.setSummary(getString( + isWifiWakeupEnabled() + ? R.string.wifi_configure_settings_preference_summary_wakeup_on + : R.string.wifi_configure_settings_preference_summary_wakeup_off)); + } final int numSavedNetworks = mWifiPickerTracker.getNumSavedNetworks(); final int numSavedSubscriptions = mWifiPickerTracker.getNumSavedSubscriptions(); diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java index 3009ae72f83..81ca183b681 100644 --- a/src/com/android/settings/wifi/ConfigureWifiSettings.java +++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java @@ -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++; } diff --git a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java index e9fd35004da..58697050375 100644 --- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java +++ b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java @@ -26,6 +26,7 @@ import android.content.IntentFilter; import android.location.LocationManager; import android.net.wifi.WifiManager; import android.provider.Settings; +import android.util.FeatureFlagUtils; import androidx.annotation.VisibleForTesting; import androidx.fragment.app.Fragment; @@ -44,6 +45,7 @@ import com.android.settingslib.core.lifecycle.events.OnResume; * {@link TogglePreferenceController} that controls whether the Wi-Fi Wakeup feature should be * enabled. */ +// TODO(b/167474581): Should clean up this controller when Provider Model finished. public class WifiWakeupPreferenceController extends TogglePreferenceController implements LifecycleObserver, OnPause, OnResume { @@ -89,6 +91,9 @@ public class WifiWakeupPreferenceController extends TogglePreferenceController i @Override public int getAvailabilityStatus() { + if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) { + return CONDITIONALLY_UNAVAILABLE; + } return AVAILABLE; }