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

Commit 65987dcf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Provider Model] Refine progress bar (QS Internet Dialog)" into... 

Merge "[Provider Model] Refine progress bar (QS Internet Dialog)" into sc-v2-dev am: 968104d2 am: d50aa788

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

Change-Id: I3e3771a68fd708639b0c58609c49891f17a3593d
parents 149908e1 d50aa788

packages/SystemUI/res/layout/internet_connectivity_dialog.xml

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ 


        <ProgressBar

            android:id="@+id/wifi_searching_progress"

            android:indeterminate="true"

            android:layout_width="340dp"

            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal"

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java

+7 −3
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public class InternetDialog extends SystemUIDialog implements 
    private static final String TAG = "InternetDialog";

    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);



    static final long PROGRESS_DELAY_MS = 2000L;

    static final long PROGRESS_DELAY_MS = 1500L;



    private final Handler mHandler;

    private final Executor mBackgroundExecutor;
@@ -549,9 +549,13 @@ public class InternetDialog extends SystemUIDialog implements 
    }



    private void setProgressBarVisible(boolean visible) {

        if (mIsProgressBarVisible == visible) {

            return;

        }

        mIsProgressBarVisible = visible;

        mProgressBar.setVisibility(mIsProgressBarVisible ? View.VISIBLE : View.GONE);

        mDivider.setVisibility(mIsProgressBarVisible ? View.GONE : View.VISIBLE);

        mProgressBar.setVisibility(visible ? View.VISIBLE : View.GONE);

        mProgressBar.setIndeterminate(visible);

        mDivider.setVisibility(visible ? View.GONE : View.VISIBLE);

        mInternetDialogSubTitle.setText(getSubtitleText());

    }