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

Merge "Set correct network type when launching wifi usage data."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-29 02:12:41 +00:00
committed by Android (Google) Code Review
parent 3a03b11ce5 079f6bd6b5
commit ea4eff318c
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/datausage/DataUsageSummaryPreference.java
View File

@@ -21,6 +21,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.net.ConnectivityManager;
import android.net.NetworkTemplate; import android.net.NetworkTemplate;
import android.os.Bundle; import android.os.Bundle;
import android.text.Spannable; import android.text.Spannable;
@@ -206,10 +207,12 @@ public class DataUsageSummaryPreference extends Preference {
} }
} }
private static void launchWifiDataUsage(Context context) { @VisibleForTesting
static void launchWifiDataUsage(Context context) {
final Bundle args = new Bundle(1); final Bundle args = new Bundle(1);
args.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE, args.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE,
NetworkTemplate.buildTemplateWifiWildcard()); NetworkTemplate.buildTemplateWifiWildcard());
args.putInt(DataUsageList.EXTRA_NETWORK_TYPE, ConnectivityManager.TYPE_WIFI);
final SubSettingLauncher launcher = new SubSettingLauncher(context) final SubSettingLauncher launcher = new SubSettingLauncher(context)
.setArguments(args) .setArguments(args)
.setDestination(DataUsageList.class.getName()) .setDestination(DataUsageList.class.getName())

13
tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
View File

@@ -26,6 +26,7 @@ import android.app.Activity;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Intent; import android.content.Intent;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.net.ConnectivityManager;
import android.net.NetworkTemplate; import android.net.NetworkTemplate;
import android.os.Bundle; import android.os.Bundle;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
@@ -531,6 +532,18 @@ public class DataUsageSummaryPreferenceTest {
assertThat(mLaunchButton.isEnabled()).isFalse(); assertThat(mLaunchButton.isEnabled()).isFalse();
} }
@Test
public void launchWifiDataUsage_shouldSetWifiNetworkTypeInIntentExtra() {
mSummaryPreference.launchWifiDataUsage(mActivity);
final Intent launchIntent = Shadows.shadowOf(mActivity).getNextStartedActivity();
final Bundle args =
launchIntent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS);
assertThat(args.getInt(DataUsageList.EXTRA_NETWORK_TYPE))
.isEqualTo(ConnectivityManager.TYPE_WIFI);
}
private void bindViewHolder() { private void bindViewHolder() {
mSummaryPreference.onBindViewHolder(mHolder); mSummaryPreference.onBindViewHolder(mHolder);
mUsageTitle = (TextView) mHolder.findViewById(R.id.usage_title); mUsageTitle = (TextView) mHolder.findViewById(R.id.usage_title);