Reshow offline indicator when chrome activity resumes

Also shorten the time to wait for stable offline to 20s.

Bug: 883020
Change-Id: If932810e0d4864fe00bd2fec980175086b43afbd
Reviewed-on: https://chromium-review.googlesource.com/1220049Reviewed-by: Peter Williamson <petewil@chromium.org>
Commit-Queue: Jian Li <jianli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#590527}

chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorController.java

@@ -52,14 +52,14 @@ public class OfflineIndicatorController implements ConnectivityDetector.Observer
 
     // Default time in seconds to wait until the offline state is stablized in the case of flaky
     // connections.
-    private static final int STABLE_OFFLINE_DEFAULT_WAIT_SECONDS = 3 * 60;
+    private static final int STABLE_OFFLINE_DEFAULT_WAIT_SECONDS = 20;
 
     @SuppressLint("StaticFieldLeak")
     private static OfflineIndicatorController sInstance;
 
     private boolean mIsShowingOfflineIndicator;
-    // Set to true if the offline indicator has been shown once.
-    private boolean mHasOfflineIndicatorShown;
+    // Set to true if the offline indicator has been shown once since the activity has resumed.
+    private boolean mHasOfflineIndicatorShownSinceActivityResumed;
     private ConnectivityDetector mConnectivityDetector;
     private ChromeActivity mObservedActivity;
 
@@ -121,6 +121,7 @@ public class OfflineIndicatorController implements ConnectivityDetector.Observer
     public void onApplicationStateChange(int newState) {
         // If the application is resumed, update the connection state and show indicator if needed.
         if (newState == ApplicationState.HAS_RUNNING_ACTIVITIES) {
+            mHasOfflineIndicatorShownSinceActivityResumed = false;
             mConnectivityDetector.detect();
             updateOfflineIndicator(mConnectivityDetector.getConnectionState()
                     == ConnectivityDetector.ConnectionState.VALIDATED);
@@ -222,7 +223,7 @@ public class OfflineIndicatorController implements ConnectivityDetector.Observer
         // be shown if the user has been continuously online for the required duration, then goes
         // back to being offline.
         // TODO(jianli): keep these values in shared prefernces. (http://crbug.com/879725)
-        if (mHasOfflineIndicatorShown
+        if (mHasOfflineIndicatorShownSinceActivityResumed
                 && SystemClock.elapsedRealtime() - mLastOnlineTime
                         < getTimeToWaitForStableOffline()) {
             return;
@@ -252,7 +253,7 @@ public class OfflineIndicatorController implements ConnectivityDetector.Observer
         RecordHistogram.recordEnumeratedHistogram("OfflineIndicator.CTR",
                 OFFLINE_INDICATOR_CTR_DISPLAYED, OFFLINE_INDICATOR_CTR_COUNT);
         mIsShowingOfflineIndicator = true;
-        mHasOfflineIndicatorShown = true;
+        mHasOfflineIndicatorShownSinceActivityResumed = true;
     }
 
     private void hideOfflineIndicator(Activity activity) {

chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/TopSnackbarManager.java

@@ -44,7 +44,7 @@ public class TopSnackbarManager
 
     @Override
     public void onActivityStateChange(Activity activity, int newState) {
-        if (newState == ActivityState.STOPPED) {
+        if (newState == ActivityState.PAUSED || newState == ActivityState.STOPPED) {
             dismissSnackbar(false);
         }
     }
@@ -70,10 +70,10 @@ public class TopSnackbarManager
      * Shows a snackbar at the top of the given activity.
      */
     public void show(Snackbar snackbar, Activity activity) {
-        if (mSnackbar != null
-                || ApplicationStatus.getStateForActivity(activity) != ActivityState.RESUMED) {
-            return;
-        }
+        if (mSnackbar != null) return;
+        @ActivityState
+        int state = ApplicationStatus.getStateForActivity(activity);
+        if (state != ActivityState.STARTED && state != ActivityState.RESUMED) return;
 
         mActivity = activity;
         mSnackbar = snackbar;