diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java index 43ebeccf892..2c61e21957e 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryPreference.java +++ b/src/com/android/settings/datausage/DataUsageSummaryPreference.java @@ -129,14 +129,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 58e42a00ccb..bfa296b6af1 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); }