From d6e4e9d8fec803ee30d5465aa2a7b541f81c319b Mon Sep 17 00:00:00 2001 From: Sarah Chin Date: Fri, 2 Oct 2020 17:15:36 -0700 Subject: [PATCH] Hide 'View plan' button in data usage settings There are currently no callers of the setSubscriptionPlan() API that have a MDP app set up. Remove the button when SubscriptionPlans are defined, since it does nothing and causes confusion for users. Test: manually verify button does not exist when a plan is defined Test: make RunSettingsRoboTests Bug: 169806315 Change-Id: Ieda020bfa692e9465d6297e50cf338deff91a8a9 Merged-In: Ieda020bfa692e9465d6297e50cf338deff91a8a9 --- .../datausage/DataUsageSummaryPreferenceController.java | 5 ++++- .../datausage/DataUsageSummaryPreferenceControllerTest.java | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java index 97cf59963b4..51f5213a547 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java +++ b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java @@ -325,7 +325,10 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc 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 + ", intent " + mManageSubscriptionIntent); } diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java index 210f0fd74b5..4a5bc700b1d 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java @@ -184,9 +184,10 @@ public class DataUsageSummaryPreferenceControllerTest { CharSequence value = captor.getValue(); 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, now - UPDATE_BACKOFF_MS, - CARRIER_NAME, 1 /* numPlans */, intent); + CARRIER_NAME, 1 /* numPlans */, null /* launchIntent */); verify(mSummaryPreference).setChartEnabled(true); verify(mSummaryPreference).setWifiMode(false /* isWifiMode */, null /* usagePeriod */, false /* isSingleWifi */);