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

Commit 4afc3f29 authored by Daniel Nishi's avatar Daniel Nishi
Browse files

Don't accordion the progress bar out. 

This stops an animation from triggering on the storage settings screen
when entering it. Because we don't load the screen until data has
loaded, we run no risk of showing an uninitialized progress bar. Thus,
we can just always show the progress bar.

Change-Id: I31814a12b9c39a33fa0fbbc4826eb4138cf09a74
Fixes: 62549522
Test: Manual
parent b2754717

res/layout/storage_item.xml

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ 
        android:layout_marginStart="72dp"

        android:layout_marginTop="16dp"

        android:layout_marginBottom="8dp"

        android:visibility="gone"

        android:max="100"

        style="?android:attr/progressBarStyleHorizontal" />

src/com/android/settings/deviceinfo/StorageItemPreference.java

+4 −8
Original line number Diff line number Diff line
@@ -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)

            return;



        if (mProgressPercent == -1) {

            mProgressBar.setVisibility(View.GONE);

        if (mProgressBar == null || mProgressPercent == UNINITIALIZED)

            return;

        }



        mProgressBar.setVisibility(View.VISIBLE);

        mProgressBar.setMax(PROGRESS_MAX);

        mProgressBar.setProgress(mProgressPercent);

    }