Revert of [Andorid] ClipDrawable progress bar experiment.

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.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.Configuration;
 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.UrlUtilities;
 import org.chromium.chrome.browser.appmenu.AppMenuButtonHelper;
 import org.chromium.chrome.browser.appmenu.AppMenuHandler;
-import org.chromium.chrome.browser.widget.ClipDrawableProgressBar;
+import org.chromium.chrome.browser.widget.SmoothProgressBar;
 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() {
+            mProgressBar.setProgress(0);
+        }
+    };
 
     private final Runnable mUpdateProgressRunnable = new Runnable() {
         @Override
         public void run() {
-            mProgressBar.setProgress(100 * mProgress);
+            mProgressBar.setProgress(mProgress);
             if (mLoading) {
                 mStopReloadButton.setImageResource(
                         R.drawable.btn_close);
             } else {
                 mStopReloadButton.setImageResource(R.drawable.btn_toolbar_reload);
+                ApiCompatibilityUtils.postOnAnimationDelayed(ChromeShellToolbar.this,
+                        mClearProgressRunnable, COMPLETED_PROGRESS_TIMEOUT_MS);
             }
         }
     };
 
     private EditText mUrlTextView;
-    private ClipDrawableProgressBar mProgressBar;
+    private SmoothProgressBar mProgressBar;
 
     private ChromeShellTab mTab;
     private final TabObserver mTabObserver;
 
     private AppMenuHandler mMenuHandler;
     private AppMenuButtonHelper mAppMenuButtonHelper;
 
     private TabManager mTabManager;
 
     private SuggestionPopup mSuggestionPopup;
@@ skipping 42 matching lines @@
      */
     public void setTabManager(TabManager tabManager) {
         mTabManager = tabManager;
     }
 
     private void onUpdateUrl(String url) {
         mUrlTextView.setText(url);
     }
 
     private void onLoadProgressChanged(int progress) {
+        removeCallbacks(mClearProgressRunnable);
         removeCallbacks(mUpdateProgressRunnable);
         mProgress = progress;
         mLoading = progress != 100;
         ApiCompatibilityUtils.postOnAnimation(this, mUpdateProgressRunnable);
     }
 
     /**
      * Closes the suggestion popup.
      */
     public void hideSuggestions() {
         if (mSuggestionPopup != null) mSuggestionPopup.hideSuggestions();
     }
 
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
 
-        mProgressBar = (ClipDrawableProgressBar) findViewById(R.id.progress);
+        mProgressBar = (SmoothProgressBar) findViewById(R.id.progress);
         initializeUrlField();
         initializeTabSwitcherButton();
         initializeMenuButton();
         initializeStopReloadButton();
         initializeAddButton();
     }
 
     void setMenuHandler(AppMenuHandler menuHandler) {
         mMenuHandler = menuHandler;
         mAppMenuButtonHelper = new AppMenuButtonHelper(mMenuHandler);
@@ skipping 144 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);
         }
     }
 }