[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:
@@ -12429,6 +12429,10 @@
|
|||||||
<string name="calls_preference_title">Calls</string>
|
<string name="calls_preference_title">Calls</string>
|
||||||
<!-- Provider Model: SMS preference title -->
|
<!-- Provider Model: SMS preference title -->
|
||||||
<string name="sms_preference_title">SMS</string>
|
<string name="sms_preference_title">SMS</string>
|
||||||
|
<!-- Network & internet preferences title [CHAR LIMIT=NONE] -->
|
||||||
|
<string name="network_and_internet_preferences_title">Preferences</string>
|
||||||
|
<!-- Network & internet preferences summary [CHAR LIMIT=NONE] -->
|
||||||
|
<string name="network_and_internet_preferences_summary">Connect to public networks</string>
|
||||||
|
|
||||||
<!-- Summary for preference when Bedtime mode is on [CHAR LIMIT=NONE] -->
|
<!-- Summary for preference when Bedtime mode is on [CHAR LIMIT=NONE] -->
|
||||||
<string name="aware_summary_when_bedtime_on">Unavailable because bedtime mode is on</string>
|
<string name="aware_summary_when_bedtime_on">Unavailable because bedtime mode is on</string>
|
||||||
|
@@ -33,7 +33,8 @@
|
|||||||
|
|
||||||
<Preference
|
<Preference
|
||||||
android:key="configure_wifi_settings"
|
android:key="configure_wifi_settings"
|
||||||
android:title="@string/wifi_configure_settings_preference_title"
|
android:title="@string/network_and_internet_preferences_title"
|
||||||
|
android:summary="@string/network_and_internet_preferences_summary"
|
||||||
settings:allowDividerAbove="true"
|
settings:allowDividerAbove="true"
|
||||||
android:fragment="com.android.settings.wifi.ConfigureWifiSettings"/>
|
android:fragment="com.android.settings.wifi.ConfigureWifiSettings"/>
|
||||||
|
|
||||||
|
@@ -828,10 +828,12 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
|
|||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
void setAdditionalSettingsSummaries() {
|
void setAdditionalSettingsSummaries() {
|
||||||
|
if (!FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) {
|
||||||
mConfigureWifiSettingsPreference.setSummary(getString(
|
mConfigureWifiSettingsPreference.setSummary(getString(
|
||||||
isWifiWakeupEnabled()
|
isWifiWakeupEnabled()
|
||||||
? R.string.wifi_configure_settings_preference_summary_wakeup_on
|
? R.string.wifi_configure_settings_preference_summary_wakeup_on
|
||||||
: R.string.wifi_configure_settings_preference_summary_wakeup_off));
|
: R.string.wifi_configure_settings_preference_summary_wakeup_off));
|
||||||
|
}
|
||||||
|
|
||||||
final int numSavedNetworks = mWifiPickerTracker.getNumSavedNetworks();
|
final int numSavedNetworks = mWifiPickerTracker.getNumSavedNetworks();
|
||||||
final int numSavedSubscriptions = mWifiPickerTracker.getNumSavedSubscriptions();
|
final int numSavedSubscriptions = mWifiPickerTracker.getNumSavedSubscriptions();
|
||||||
|
@@ -21,6 +21,8 @@ import android.app.settings.SettingsEnums;
|
|||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.net.wifi.WifiManager;
|
import android.net.wifi.WifiManager;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.util.FeatureFlagUtils;
|
||||||
|
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.dashboard.DashboardFragment;
|
import com.android.settings.dashboard.DashboardFragment;
|
||||||
@@ -42,6 +44,14 @@ public class ConfigureWifiSettings extends DashboardFragment {
|
|||||||
private WifiWakeupPreferenceController mWifiWakeupPreferenceController;
|
private WifiWakeupPreferenceController mWifiWakeupPreferenceController;
|
||||||
private UseOpenWifiPreferenceController mUseOpenWifiPreferenceController;
|
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
|
@Override
|
||||||
public int getMetricsCategory() {
|
public int getMetricsCategory() {
|
||||||
return SettingsEnums.CONFIGURE_WIFI;
|
return SettingsEnums.CONFIGURE_WIFI;
|
||||||
@@ -54,7 +64,10 @@ public class ConfigureWifiSettings extends DashboardFragment {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getInitialExpandedChildCount() {
|
public int getInitialExpandedChildCount() {
|
||||||
int tileLimit = 2;
|
int tileLimit = 1;
|
||||||
|
if (mWifiWakeupPreferenceController.isAvailable()) {
|
||||||
|
tileLimit++;
|
||||||
|
}
|
||||||
if (mUseOpenWifiPreferenceController.isAvailable()) {
|
if (mUseOpenWifiPreferenceController.isAvailable()) {
|
||||||
tileLimit++;
|
tileLimit++;
|
||||||
}
|
}
|
||||||
|
@@ -26,6 +26,7 @@ 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;
|
||||||
@@ -44,6 +45,7 @@ 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 {
|
||||||
|
|
||||||
@@ -89,6 +91,9 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user