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

Commit b7cb887f authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Fix Change link is not clickable in Internet 

Links are not allowed in footer preference title now.

So splitting the string in to title text and change text to fix.

Fix: 232481379
Test: manual test
Change-Id: I857b33ac06ec2fb9619da94a2947dbc25f5b28db
parent 98fa9deb

res/values/strings.xml

+3 −1
Original line number Diff line number Diff line
@@ -13649,7 +13649,9 @@ 
    <string name="default_active_sim_mobile_data">mobile data</string>

    <!-- Provider Model: Message to describe "Wi-Fi scan always available feature" when Wi-Fi is off and Wi-Fi

    scanning is on. To mark a link to bring the user to "scanning settings" screen. [CHAR LIMIT=NONE]-->

    <string name="wifi_scan_notify_message">To improve device experience, apps and services can still scan for Wi\u2011Fi networks at any time, even when Wi\u2011Fi is off. This can be used, for example, to improve location-based features and services. You can change this in Wi\u2011Fi scanning settings. <annotation id="link">Change</annotation></string>

    <string name="wifi_scan_notify_message">To improve device experience, apps and services can still scan for Wi\u2011Fi networks at any time, even when Wi\u2011Fi is off. This can be used, for example, to improve location-based features and services. You can change this in Wi\u2011Fi scanning settings.</string>

    <!-- Provider Model: Link text to bring the user to "scanning settings" screen. [CHAR LIMIT=NONE]-->

    <string name="wifi_scan_change">Change</string>















    <!-- Summary text separator for preferences including a short description















         (eg. "Connected / 5G"). [CHAR LIMIT=50] -->

























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



+4
−7




























Original line number
Diff line number
Diff line








@@ -67,7 +67,6 @@ import com.android.settings.datausage.DataUsagePreference;













import com.android.settings.datausage.DataUsageUtils;















import com.android.settings.location.WifiScanningFragment;















import com.android.settings.search.BaseSearchIndexProvider;













import com.android.settings.utils.AnnotationSpan;















import com.android.settings.wifi.AddNetworkFragment;















import com.android.settings.wifi.AddWifiNetworkPreference;















import com.android.settings.wifi.ConfigureWifiEntryFragment;










@@ -829,12 +828,10 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment













            return;















        }















        if (TextUtils.isEmpty(mWifiStatusMessagePreference.getTitle())) {













            AnnotationSpan.LinkInfo info = new AnnotationSpan.LinkInfo(













                AnnotationSpan.LinkInfo.DEFAULT_ANNOTATION,













                v -> launchWifiScanningFragment());













            CharSequence text = AnnotationSpan.linkify(













                context.getText(R.string.wifi_scan_notify_message), info);













            mWifiStatusMessagePreference.setTitle(text);













            mWifiStatusMessagePreference.setTitle(R.string.wifi_scan_notify_message);













            mWifiStatusMessagePreference.setLearnMoreText(













                    context.getString(R.string.wifi_scan_change));













            mWifiStatusMessagePreference.setLearnMoreAction(v -> launchWifiScanningFragment());















        }















        mWifiStatusMessagePreference.setVisible(true);















    }