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

Fix Change link is not clickable in Internet

Browse Source 
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
This commit is contained in:
Chaohui Wang
2022-05-13 10:55:58 +08:00
parent 98fa9deb4a
commit b7cb887f8e
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -13649,7 +13649,9 @@
<string name="default_active_sim_mobile_data">mobile data</string> <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 <!-- 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]--> 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 <!-- Summary text separator for preferences including a short description
(eg. "Connected / 5G"). [CHAR LIMIT=50] --> (eg. "Connected / 5G"). [CHAR LIMIT=50] -->

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

@@ -67,7 +67,6 @@ import com.android.settings.datausage.DataUsagePreference;
import com.android.settings.datausage.DataUsageUtils; import com.android.settings.datausage.DataUsageUtils;
import com.android.settings.location.WifiScanningFragment; import com.android.settings.location.WifiScanningFragment;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.utils.AnnotationSpan;
import com.android.settings.wifi.AddNetworkFragment; import com.android.settings.wifi.AddNetworkFragment;
import com.android.settings.wifi.AddWifiNetworkPreference; import com.android.settings.wifi.AddWifiNetworkPreference;
import com.android.settings.wifi.ConfigureWifiEntryFragment; import com.android.settings.wifi.ConfigureWifiEntryFragment;
@@ -829,12 +828,10 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
return; return;
} }
if (TextUtils.isEmpty(mWifiStatusMessagePreference.getTitle())) { if (TextUtils.isEmpty(mWifiStatusMessagePreference.getTitle())) {
AnnotationSpan.LinkInfo info = new AnnotationSpan.LinkInfo( mWifiStatusMessagePreference.setTitle(R.string.wifi_scan_notify_message);
AnnotationSpan.LinkInfo.DEFAULT_ANNOTATION, mWifiStatusMessagePreference.setLearnMoreText(
v -> launchWifiScanningFragment()); context.getString(R.string.wifi_scan_change));
CharSequence text = AnnotationSpan.linkify( mWifiStatusMessagePreference.setLearnMoreAction(v -> launchWifiScanningFragment());
context.getText(R.string.wifi_scan_notify_message), info);
mWifiStatusMessagePreference.setTitle(text);
} }
mWifiStatusMessagePreference.setVisible(true); mWifiStatusMessagePreference.setVisible(true);
} }