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

Commit 75943c62 authored Apr 21, 2021 by Arc Wang Committed by Automerger Merge Worker Apr 21, 2021

Merge "Fix UsageProgressBarPreference progress bug when zero total size" into sc-dev am: b0ea1529

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14248586

Change-Id: I229a42f516783bdee641ced53e4cd77cacfcdbe4

parents 1f53224d b0ea1529

packages/SettingsLib/UsageProgressBarPreference/src/com/android/settingslib/widget/UsageProgressBarPreference.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,14 @@ public class UsageProgressBarPreference extends Preference {

		/** Set percentage of the progress bar. */
		public void setPercent(long usage, long total) {
		if (total == 0L \|\| usage > total) {
		if (usage > total) {
		return;
		}
		if (total == 0L) {
		if (mPercent != 0) {
		mPercent = 0;
		notifyChanged();
		}
		return;
		}
		final int percent = (int) (usage / (double) total * 100);

packages/SettingsLib/tests/integ/src/com/android/settingslib/widget/UsageProgressBarPreferenceTest.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -124,6 +124,17 @@ public class UsageProgressBarPreferenceTest {
		assertThat(progressBar.getProgress()).isEqualTo((int) (31.0f / 80 * 100));
		}

		@Test
		public void setPercent_totalSizeZero_getProgressZero() {
		mUsageProgressBarPreference.setPercent(0 /* usage /, 0 / total */);

		mUsageProgressBarPreference.onBindViewHolder(mViewHolder);

		final ProgressBar progressBar = (ProgressBar) mViewHolder
		.findViewById(android.R.id.progress);
		assertThat(progressBar.getProgress()).isEqualTo(0);
		}

		@Test
		public void setCustomContent_setNullImageView_noChild() {
		mUsageProgressBarPreference.setCustomContent(null /* imageView */);