From 641288f7c1be97027f983d3b09be40107c26a943 Mon Sep 17 00:00:00 2001 From: Jan Nordqvist Date: Mon, 19 Mar 2018 09:58:11 -0700 Subject: [PATCH] In Data Usage screen, hide data bar if plan is unlimited Bug: 70950124 Test: manual Test: make RunSettingsRoboTests Change-Id: I1314bdf9748c55a2391ccb39ff66c3dcb133be7e --- .../settings/datausage/DataUsageSummaryPreference.java | 5 +++-- .../settings/datausage/DataUsageSummaryPreferenceTest.java | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java index e8715aac296..75549beafae 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryPreference.java +++ b/src/com/android/settings/datausage/DataUsageSummaryPreference.java @@ -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); } diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java index 638ee792045..8d00c3a5621 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java @@ -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); }