From 2c7937f8534173f87b3b80464b844ca697ae133d Mon Sep 17 00:00:00 2001
From: Weng Su <wengsu@google.com>
Date: Sat, 4 Dec 2021 21:28:48 +0800
Subject: [PATCH] [Provider Model] Refine progress bar (QS Internet Dialog)

- Dynamically set the Indeterminate parameter to avoid animation
initialization issues.

- If the status has not changed, avoid restarting the progress bar.

Bug: 206061969
Bug: 208702776
Test: manual test
atest -c InternetDialogTest

Change-Id: I265a68126fd523f1996c09072f5a9220f9cb5adf
---
 .../res/layout/internet_connectivity_dialog.xml        |  1 -
 .../systemui/qs/tiles/dialog/InternetDialog.java       | 10 +++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/SystemUI/res/layout/internet_connectivity_dialog.xml b/packages/SystemUI/res/layout/internet_connectivity_dialog.xml
index e90a6446c47b5..c575855d9af88 100644
--- a/packages/SystemUI/res/layout/internet_connectivity_dialog.xml
+++ b/packages/SystemUI/res/layout/internet_connectivity_dialog.xml
@@ -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"
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java
index 26c89ff830767..65fe93cb0170e 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java
@@ -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());
     }