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

Change the Network preference summary for wifi option

Browse Source 
Bug:192987269
Test: Manual test
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I3892386f8fe2e5c3e29cd7e91f88db65c3693990
This commit is contained in:
changbetty
2021-07-20 15:06:09 +00:00
committed by Betty Chang
parent 9112e238a6
commit 1d37fc6daf
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -13340,8 +13340,6 @@
<string name="calls_sms_no_sim">No SIM</string> <string name="calls_sms_no_sim">No SIM</string>
<!-- Network & internet preferences title [CHAR LIMIT=NONE] --> <!-- Network & internet preferences title [CHAR LIMIT=NONE] -->
<string name="network_and_internet_preferences_title">Network preferences</string> <string name="network_and_internet_preferences_title">Network preferences</string>
<!-- Network & internet preferences summary [CHAR LIMIT=NONE] -->
<string name="network_and_internet_preferences_summary">Connect to public networks</string>
<!-- Search keywords for "Internet" settings [CHAR_LIMIT=NONE] --> <!-- Search keywords for "Internet" settings [CHAR_LIMIT=NONE] -->
<string name="keywords_internet">network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, cell carrier, 4g, 3g, 2g, lte</string> <string name="keywords_internet">network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, cell carrier, 4g, 3g, 2g, lte</string>
<!-- Slice title text for turning on the Wi-Fi networks. [CHAR LIMIT=40] --> <!-- Slice title text for turning on the Wi-Fi networks. [CHAR LIMIT=40] -->

1
res/xml/network_provider_settings.xml
View File

@@ -70,7 +70,6 @@
<Preference <Preference
android:key="configure_wifi_settings" android:key="configure_wifi_settings"
android:title="@string/network_and_internet_preferences_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"/>

2
src/com/android/settings/network/NetworkProviderSettings.java
View File

@@ -957,12 +957,10 @@ 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();