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

Merge "[Wi-Fi] Use getUriHelpString() result to judge if Settings APP should register the help button click event and file related intent if need." into rvc-dev

Browse Source
This commit is contained in:
Goven Liu
2020-04-08 22:37:35 +00:00
committed by Android (Google) Code Review
parent e886ef9e9a a82d2c8a88
commit 5a8e9e452a
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/wifi/WifiSettings2.java
View File

@@ -770,9 +770,9 @@ public class WifiSettings2 extends RestrictedSettingsFragment
pref.setOrder(index++);
pref.refresh();
if (wifiEntry.canManageSubscription()) {
if (wifiEntry.getHelpUriString() != null) {
pref.setOnButtonClickListener(preference -> {
openSubscriptionHelpPage();
openSubscriptionHelpPage(wifiEntry);
});
}
mWifiEntryPreferenceCategory.addPreference(pref);
@@ -1111,8 +1111,8 @@ public class WifiSettings2 extends RestrictedSettingsFragment
}
@VisibleForTesting
void openSubscriptionHelpPage() {
final Intent intent = getHelpIntent(getContext());
void openSubscriptionHelpPage(WifiEntry wifiEntry) {
final Intent intent = getHelpIntent(getContext(), wifiEntry.getHelpUriString());
if (intent != null) {
try {
startActivityForResult(intent, MANAGE_SUBSCRIPTION);
@@ -1123,10 +1123,7 @@ public class WifiSettings2 extends RestrictedSettingsFragment
}
@VisibleForTesting
Intent getHelpIntent(Context context) {
return HelpUtils.getHelpIntent(
context,
context.getString(R.string.help_url_manage_wifi_subscription),
context.getClass().getName());
Intent getHelpIntent(Context context, String helpUrlString) {
return HelpUtils.getHelpIntent(context, helpUrlString, context.getClass().getName());
}
}