Merge "[Provider Model] Refine progress bar (QS Internet Dialog)" into sc-v2-dev

This commit is contained in:
TreeHugger Robot
2021-12-08 01:28:02 +00:00
committed by Android (Google) Code Review
2 changed files with 7 additions and 4 deletions

View File

@@ -67,7 +67,6 @@
<ProgressBar <ProgressBar
android:id="@+id/wifi_searching_progress" android:id="@+id/wifi_searching_progress"
android:indeterminate="true"
android:layout_width="340dp" android:layout_width="340dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"

View File

@@ -78,7 +78,7 @@ public class InternetDialog extends SystemUIDialog implements
private static final String TAG = "InternetDialog"; private static final String TAG = "InternetDialog";
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); 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 Handler mHandler;
private final Executor mBackgroundExecutor; private final Executor mBackgroundExecutor;
@@ -549,9 +549,13 @@ public class InternetDialog extends SystemUIDialog implements
} }
private void setProgressBarVisible(boolean visible) { private void setProgressBarVisible(boolean visible) {
if (mIsProgressBarVisible == visible) {
return;
}
mIsProgressBarVisible = visible; mIsProgressBarVisible = visible;
mProgressBar.setVisibility(mIsProgressBarVisible ? View.VISIBLE : View.GONE); mProgressBar.setVisibility(visible ? View.VISIBLE : View.GONE);
mDivider.setVisibility(mIsProgressBarVisible ? View.GONE : View.VISIBLE); mProgressBar.setIndeterminate(visible);
mDivider.setVisibility(visible ? View.GONE : View.VISIBLE);
mInternetDialogSubTitle.setText(getSubtitleText()); mInternetDialogSubTitle.setText(getSubtitleText());
} }