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

Commit 94cabf8a authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Hide 'View plan' button in data usage settings" am: 07f2c27c 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1480638

Change-Id: I851c0994ed2aa79148b2b22d1733256c845a50a9
parents ef4f13c9 07f2c27c

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 */);