Merge "Don't accordion the progress bar out." into oc-dr1-dev am: 648e31c283

am: 7ffa9b3a7b

Change-Id: If196b0729631c0817113e53b5126fc30b75c2833
This commit is contained in:
Daniel Nishi
2017-06-21 18:28:53 +00:00
committed by android-build-merger
2 changed files with 4 additions and 9 deletions

View File

@@ -30,9 +30,11 @@ import com.android.settings.utils.FileSizeFormatter;
public class StorageItemPreference extends Preference {
public int userHandle;
private static final int UNINITIALIZED = -1;
private ProgressBar mProgressBar;
private static final int PROGRESS_MAX = 100;
private int mProgressPercent = -1;
private int mProgressPercent = UNINITIALIZED;
public StorageItemPreference(Context context) {
this(context, null);
@@ -60,15 +62,9 @@ public class StorageItemPreference extends Preference {
}
protected void updateProgressBar() {
if (mProgressBar == null)
if (mProgressBar == null || mProgressPercent == UNINITIALIZED)
return;
if (mProgressPercent == -1) {
mProgressBar.setVisibility(View.GONE);
return;
}
mProgressBar.setVisibility(View.VISIBLE);
mProgressBar.setMax(PROGRESS_MAX);
mProgressBar.setProgress(mProgressPercent);
}