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

2
res/values/strings.xml
View File

@@ -7181,8 +7181,6 @@
<string name="help_url_double_tap_screen" translatable="false"></string> <string name="help_url_double_tap_screen" translatable="false"></string>
<string name="help_url_account_detail" translatable="false"></string> <string name="help_url_account_detail" translatable="false"></string>
<string name="help_url_icc_lock" translatable="false"></string> <string name="help_url_icc_lock" translatable="false"></string>
<!-- Help URI, ManageSubscription [DO NOT TRANSLATE] -->
<string name="help_url_manage_wifi_subscription" translatable="false"></string>
<string name="help_uri_process_stats_summary" translatable="false"></string> <string name="help_uri_process_stats_summary" translatable="false"></string>
<string name="help_uri_process_stats_apps" translatable="false"></string> <string name="help_uri_process_stats_apps" translatable="false"></string>

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

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

7
tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java
View File

@@ -74,6 +74,7 @@ import org.robolectric.shadows.ShadowToast;
public class WifiSettings2Test { public class WifiSettings2Test {
private static final int NUM_NETWORKS = 4; private static final int NUM_NETWORKS = 4;
private static final String FAKE_URI_STRING = "fakeuri";
@Mock @Mock
private PowerManager mPowerManager; private PowerManager mPowerManager;
@@ -281,10 +282,12 @@ public class WifiSettings2Test {
@Test @Test
public void openSubscriptionHelpPage_shouldCallStartActivityForResult() { public void openSubscriptionHelpPage_shouldCallStartActivityForResult() {
doReturn(new Intent()).when(mWifiSettings2).getHelpIntent(mContext); doReturn(new Intent()).when(mWifiSettings2).getHelpIntent(mContext, FAKE_URI_STRING);
doNothing().when(mWifiSettings2).startActivityForResult(any(Intent.class), anyInt()); doNothing().when(mWifiSettings2).startActivityForResult(any(Intent.class), anyInt());
final WifiEntry mockWifiEntry = mock(WifiEntry.class);
when(mockWifiEntry.getHelpUriString()).thenReturn(FAKE_URI_STRING);
mWifiSettings2.openSubscriptionHelpPage(); mWifiSettings2.openSubscriptionHelpPage(mockWifiEntry);
verify(mWifiSettings2, times(1)).startActivityForResult(any(), anyInt()); verify(mWifiSettings2, times(1)).startActivityForResult(any(), anyInt());
} }