PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "In Data Usage screen, hide data bar if plan is unlimited" into pi-dev

Browse Source
This commit is contained in:
Andreas Terzis
2018-03-20 05:49:51 +00:00
committed by Android (Google) Code Review
parent 06d5188a71 641288f7c1
commit 91ea3c5e56
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/datausage/DataUsageSummaryPreference.java
View File

@@ -129,14 +129,15 @@ public class DataUsageSummaryPreference extends Preference {
public void onBindViewHolder(PreferenceViewHolder holder) { public void onBindViewHolder(PreferenceViewHolder holder) {
super.onBindViewHolder(holder); super.onBindViewHolder(holder);
ProgressBar bar = (ProgressBar) holder.findViewById(R.id.determinateBar);
if (mChartEnabled && (!TextUtils.isEmpty(mStartLabel) || !TextUtils.isEmpty(mEndLabel))) { if (mChartEnabled && (!TextUtils.isEmpty(mStartLabel) || !TextUtils.isEmpty(mEndLabel))) {
bar.setVisibility(View.VISIBLE);
holder.findViewById(R.id.label_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)); bar.setProgress((int) (mProgress * 100));
((TextView) holder.findViewById(android.R.id.text1)).setText(mStartLabel); ((TextView) holder.findViewById(android.R.id.text1)).setText(mStartLabel);
((TextView) holder.findViewById(android.R.id.text2)).setText(mEndLabel); ((TextView) holder.findViewById(android.R.id.text2)).setText(mEndLabel);
} else { } else {
bar.setVisibility(View.GONE);
holder.findViewById(R.id.label_bar).setVisibility(View.GONE); holder.findViewById(R.id.label_bar).setVisibility(View.GONE);
} }

3
tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
View File

@@ -228,6 +228,7 @@ public class DataUsageSummaryPreferenceTest {
bindViewHolder(); bindViewHolder();
assertThat(mLabelBar.getVisibility()).isEqualTo(View.GONE); assertThat(mLabelBar.getVisibility()).isEqualTo(View.GONE);
assertThat(mProgressBar.getVisibility()).isEqualTo(View.GONE);
} }
@Test @Test
@@ -236,6 +237,7 @@ public class DataUsageSummaryPreferenceTest {
bindViewHolder(); bindViewHolder();
assertThat(mLabelBar.getVisibility()).isEqualTo(View.GONE); assertThat(mLabelBar.getVisibility()).isEqualTo(View.GONE);
assertThat(mProgressBar.getVisibility()).isEqualTo(View.GONE);
} }
@Test @Test
@@ -245,6 +247,7 @@ public class DataUsageSummaryPreferenceTest {
bindViewHolder(); bindViewHolder();
assertThat(mLabelBar.getVisibility()).isEqualTo(View.VISIBLE); assertThat(mLabelBar.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(mProgressBar.getVisibility()).isEqualTo(View.VISIBLE);
} }