[Android] Invalidate ChromeShell progress bar during animation

chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellToolbar.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.shell;
 
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.drawable.ClipDrawable;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
+import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.CommandLine;
 import org.chromium.chrome.browser.EmptyTabObserver;
 import org.chromium.chrome.browser.Tab;
 import org.chromium.chrome.browser.TabObserver;
 import org.chromium.chrome.browser.appmenu.AppMenuButtonHelper;
 import org.chromium.chrome.browser.appmenu.AppMenuHandler;
 import org.chromium.chrome.shell.omnibox.SuggestionPopup;
 import org.chromium.content.common.ContentSwitches;
 
 /**
  * A Toolbar {@link View} that shows the URL and navigation buttons.
  */
 public class ChromeShellToolbar extends LinearLayout {
     private static final long COMPLETED_PROGRESS_TIMEOUT_MS = 200;
 
     private final Runnable mClearProgressRunnable = new Runnable() {
         @Override
         public void run() {
             mProgressDrawable.setLevel(0);
         }
     };
 
+    private final Runnable mUpdateProgressRunnable = new Runnable() {
+        @Override
+        public void run() {
+            mProgressDrawable.setLevel(100 * mProgress);
+            if (mLoading) {
+                mStopReloadButton.setImageResource(R.drawable.btn_stop_normal);
+            } else {
+                mStopReloadButton.setImageResource(R.drawable.btn_reload_normal);
+                ApiCompatibilityUtils.postOnAnimationDelayed(ChromeShellToolbar.this,
+                        mClearProgressRunnable, COMPLETED_PROGRESS_TIMEOUT_MS);
+            }
+        }
+    };
+
     private EditText mUrlTextView;
     private ClipDrawable mProgressDrawable;
 
     private ChromeShellTab mTab;
     private final TabObserver mTabObserver;
 
     private AppMenuHandler mMenuHandler;
     private AppMenuButtonHelper mAppMenuButtonHelper;
 
     private SuggestionPopup mSuggestionPopup;
 
     private ImageButton mStopReloadButton;
+    private int mProgress = 0;
     private boolean mLoading = true;
 
     /**
      * @param context The Context the view is running in.
      * @param attrs   The attributes of the XML tag that is inflating the view.
      */
     public ChromeShellToolbar(Context context, AttributeSet attrs) {
         super(context, attrs);
         // When running performance benchmark, we don't want to observe the tab
         // invalidation which would interfere with browser's processing content
@@ skipping 15 matching lines @@
         mTab = tab;
         mTab.addObserver(mTabObserver);
         mUrlTextView.setText(mTab.getWebContents().getUrl());
     }
 
     private void onUpdateUrl(String url) {
         mUrlTextView.setText(url);
     }
 
     private void onLoadProgressChanged(int progress) {
         removeCallbacks(mClearProgressRunnable);

[nyquist, 2014/09/18 21:43:23]

Should this stay here or move to the other update progress runnable? It feels a
bit unbalanced, but it might just be me.

[jdduke (slow), 2014/09/18 21:59:22]

I think it can go there, but then we might have a scenario where both callbacks
are scheduled during the same animation callback, so it could be doing extra
setLevel work. I don't have a strong opinion though, up to you.

-        mProgressDrawable.setLevel(100 * progress);
+        removeCallbacks(mUpdateProgressRunnable);
+        mProgress = progress;
         mLoading = progress != 100;
-        if (mLoading) {
-            mStopReloadButton.setImageResource(R.drawable.btn_stop_normal);
-        } else {
-            mStopReloadButton.setImageResource(R.drawable.btn_reload_normal);
-            postDelayed(mClearProgressRunnable, COMPLETED_PROGRESS_TIMEOUT_MS);
-        }
+        ApiCompatibilityUtils.postOnAnimation(this, mUpdateProgressRunnable);
     }
 
     /**
      * Closes the suggestion popup.
      */
     public void hideSuggestions() {
         if (mSuggestionPopup != null) mSuggestionPopup.hideSuggestions();
     }
 
     @Override
@@ skipping 120 matching lines @@
         public void onLoadProgressChanged(Tab tab, int progress) {
             if (tab == mTab) ChromeShellToolbar.this.onLoadProgressChanged(progress);
         }
 
         @Override
         public void onUpdateUrl(Tab tab, String url) {
             if (tab == mTab) ChromeShellToolbar.this.onUpdateUrl(url);
         }
     }
 }