Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d37fc6d authored by changbetty's avatar changbetty Committed by Betty Chang
Browse files

Change the Network preference summary for wifi option 

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

Change-Id: I3892386f8fe2e5c3e29cd7e91f88db65c3693990
parent 9112e238

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -13340,8 +13340,6 @@ 
    <string name="calls_sms_no_sim">No SIM</string>

    <!-- Network & internet preferences title [CHAR LIMIT=NONE] -->

    <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] -->

    <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] -->

res/xml/network_provider_settings.xml

+0 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ 
    <Preference

        android:key="configure_wifi_settings"

        android:title="@string/network_and_internet_preferences_title"

        android:summary="@string/network_and_internet_preferences_summary"

        settings:allowDividerAbove="true"

        android:fragment="com.android.settings.wifi.ConfigureWifiSettings"/>

src/com/android/settings/network/NetworkProviderSettings.java

+4 −6
Original line number Diff line number Diff line
@@ -957,12 +957,10 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment 


    @VisibleForTesting

    void setAdditionalSettingsSummaries() {

        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();