Bug 955870 - Backout unwanted part of patch r=me

This commit is contained in:
Mark Finkle 2014-01-04 09:51:58 -05:00
parent f9c055f709
commit f7676c2602

View File

@ -128,7 +128,7 @@ public class BrowserToolbar extends GeckoRelativeLayout
private ImageButton mSiteSecurity;
private PageActionLayout mPageActionLayout;
//private Animation mProgressSpinner;
private Animation mProgressSpinner;
private TabCounter mTabsCounter;
private GeckoImageButton mMenu;
private GeckoImageView mMenuIcon;
@ -303,7 +303,7 @@ public class BrowserToolbar extends GeckoRelativeLayout
mSiteIdentityPopup = new SiteIdentityPopup(mActivity);
mSiteIdentityPopup.setAnchor(mSiteSecurity);
//mProgressSpinner = AnimationUtils.loadAnimation(mActivity, R.anim.progress_spinner);
mProgressSpinner = AnimationUtils.loadAnimation(mActivity, R.anim.progress_spinner);
mStop = (ImageButton) findViewById(R.id.stop);
mPageActionLayout = (PageActionLayout) findViewById(R.id.page_action_layout);
@ -785,8 +785,8 @@ public class BrowserToolbar extends GeckoRelativeLayout
// To stop the glitch caused by multiple start() calls.
if (!mSpinnerVisible) {
setPageActionVisibility(true);
//mFavicon.setAnimation(mProgressSpinner);
//mProgressSpinner.start();
mFavicon.setAnimation(mProgressSpinner);
mProgressSpinner.start();
mSpinnerVisible = true;
}
Log.i(LOGTAG, "zerdatime " + SystemClock.uptimeMillis() + " - Throbber start");
@ -799,7 +799,7 @@ public class BrowserToolbar extends GeckoRelativeLayout
if (mSpinnerVisible) {
setPageActionVisibility(false);
mFavicon.setAnimation(null);
//mProgressSpinner.cancel();
mProgressSpinner.cancel();
mSpinnerVisible = false;
}
Log.i(LOGTAG, "zerdatime " + SystemClock.uptimeMillis() + " - Throbber stop");