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

Merge "Hide 'View plan' button in data usage settings" into rvc-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-10-16 22:18:33 +00:00
committed by Android (Google) Code Review
parent 7ea9985044 f3d7860c70
commit 1a09d244d4
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -325,7 +325,10 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc
mSnapshotTime = primaryPlan.getDataUsageTime(); mSnapshotTime = primaryPlan.getDataUsageTime();
} }
} }
mManageSubscriptionIntent = createManageSubscriptionIntent(mSubId); // Temporarily return null, since no current users of SubscriptionPlan have this intent set.
// TODO (b/170330084): Remove after refactoring 5G SubscriptionPlan logic.
// mManageSubscriptionIntent = createManageSubscriptionIntent(mSubId);
mManageSubscriptionIntent = null;
Log.i(TAG, "Have " + mDataplanCount + " plans, dflt sub-id " + mSubId Log.i(TAG, "Have " + mDataplanCount + " plans, dflt sub-id " + mSubId
+ ", intent " + mManageSubscriptionIntent); + ", intent " + mManageSubscriptionIntent);
} }

3
tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
View File

@@ -184,9 +184,10 @@ public class DataUsageSummaryPreferenceControllerTest {
CharSequence value = captor.getValue(); CharSequence value = captor.getValue();
assertThat(value.toString()).isEqualTo("512 MB data warning / 1.00 GB data limit"); assertThat(value.toString()).isEqualTo("512 MB data warning / 1.00 GB data limit");
// TODO (b/170330084): return intent instead of null for mSummaryPreference
verify(mSummaryPreference).setUsageInfo((info.cycleEnd / 1000) * 1000, verify(mSummaryPreference).setUsageInfo((info.cycleEnd / 1000) * 1000,
now - UPDATE_BACKOFF_MS, now - UPDATE_BACKOFF_MS,
CARRIER_NAME, 1 /* numPlans */, intent); CARRIER_NAME, 1 /* numPlans */, null /* launchIntent */);
verify(mSummaryPreference).setChartEnabled(true); verify(mSummaryPreference).setChartEnabled(true);
verify(mSummaryPreference).setWifiMode(false /* isWifiMode */, null /* usagePeriod */, verify(mSummaryPreference).setWifiMode(false /* isWifiMode */, null /* usagePeriod */,
false /* isSingleWifi */); false /* isSingleWifi */);