Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07f2c27c authored by Sarah Chin's avatar Sarah Chin Committed by Gerrit Code Review
Browse files

Merge "Hide 'View plan' button in data usage settings"

parents 7e65d7f6 d6e4e9d8

src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java

+4 −1
Original line number Diff line number Diff line
@@ -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);

    }

tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -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 */);