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

Commit 641288f7 authored by Jan Nordqvist's avatar Jan Nordqvist
Browse files

In Data Usage screen, hide data bar if plan is unlimited 

Bug: 70950124

Test: manual
Test: make RunSettingsRoboTests
Change-Id: I1314bdf9748c55a2391ccb39ff66c3dcb133be7e
parent 767743d6

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

+3 −2
Original line number Diff line number Diff line
@@ -126,14 +126,15 @@ public class DataUsageSummaryPreference extends Preference { 
    public void onBindViewHolder(PreferenceViewHolder holder) {

        super.onBindViewHolder(holder);





        ProgressBar bar = (ProgressBar) holder.findViewById(R.id.determinateBar);

        if (mChartEnabled && (!TextUtils.isEmpty(mStartLabel) || !TextUtils.isEmpty(mEndLabel))) {

            bar.setVisibility(View.VISIBLE);

            holder.findViewById(R.id.label_bar).setVisibility(View.VISIBLE);

            ProgressBar bar = (ProgressBar) holder.findViewById(R.id.determinateBar);

            bar.setProgress((int) (mProgress * 100));

            ((TextView) holder.findViewById(android.R.id.text1)).setText(mStartLabel);

            ((TextView) holder.findViewById(android.R.id.text2)).setText(mEndLabel);

        } else {

            bar.setVisibility(View.GONE);

            holder.findViewById(R.id.label_bar).setVisibility(View.GONE);

        }

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

+3 −0
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ public class DataUsageSummaryPreferenceTest { 


        bindViewHolder();

        assertThat(mLabelBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mProgressBar.getVisibility()).isEqualTo(View.GONE);

    }



    @Test
@@ -236,6 +237,7 @@ public class DataUsageSummaryPreferenceTest { 


        bindViewHolder();

        assertThat(mLabelBar.getVisibility()).isEqualTo(View.GONE);

        assertThat(mProgressBar.getVisibility()).isEqualTo(View.GONE);

    }



    @Test
@@ -245,6 +247,7 @@ public class DataUsageSummaryPreferenceTest { 


        bindViewHolder();

        assertThat(mLabelBar.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(mProgressBar.getVisibility()).isEqualTo(View.VISIBLE);

    }