In Data Usage screen, hide data bar if plan is unlimited
Bug: 70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I1314bdf9748c55a2391ccb39ff66c3dcb133be7e
diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java
index e8715aa..75549be 100644
--- a/src/com/android/settings/datausage/DataUsageSummaryPreference.java
+++ b/src/com/android/settings/datausage/DataUsageSummaryPreference.java
@@ -126,14 +126,15 @@
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 638ee79..8d00c3a 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 @@
bindViewHolder();
assertThat(mLabelBar.getVisibility()).isEqualTo(View.GONE);
+ assertThat(mProgressBar.getVisibility()).isEqualTo(View.GONE);
}
@Test
@@ -236,6 +237,7 @@
bindViewHolder();
assertThat(mLabelBar.getVisibility()).isEqualTo(View.GONE);
+ assertThat(mProgressBar.getVisibility()).isEqualTo(View.GONE);
}
@Test
@@ -245,6 +247,7 @@
bindViewHolder();
assertThat(mLabelBar.getVisibility()).isEqualTo(View.VISIBLE);
+ assertThat(mProgressBar.getVisibility()).isEqualTo(View.VISIBLE);
}