From b7cb887f8ec86ba68a2c13b7224892ef19017bc7 Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Fri, 13 May 2022 10:55:58 +0800 Subject: [PATCH] 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 --- res/values/strings.xml | 4 +++- .../settings/network/NetworkProviderSettings.java | 11 ++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 9ab0cc2d301..cec342f30d5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -13649,7 +13649,9 @@ mobile data - 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. Change + 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. + + Change diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java index de4d127a84e..ec17dd371b1 100644 --- a/src/com/android/settings/network/NetworkProviderSettings.java +++ b/src/com/android/settings/network/NetworkProviderSettings.java @@ -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); }