From 21e120c8d18a0af8bd5bde94201bb1e39dfcdfe1 Mon Sep 17 00:00:00 2001 From: Brian Nicholson Date: Wed, 26 Feb 2014 11:02:21 -0800 Subject: [PATCH] Bug 969492 - Use 10% as the load progress reset state. r=lucasr --- mobile/android/base/Tab.java | 2 ++ mobile/android/base/toolbar/BrowserToolbar.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mobile/android/base/Tab.java b/mobile/android/base/Tab.java index 0256f312d17..434ac329719 100644 --- a/mobile/android/base/Tab.java +++ b/mobile/android/base/Tab.java @@ -74,6 +74,7 @@ public class Tab { public static final int STATE_SUCCESS = 2; public static final int STATE_ERROR = 3; + public static final int LOAD_PROGRESS_INIT = 10; public static final int LOAD_PROGRESS_START = 20; public static final int LOAD_PROGRESS_LOCATION_CHANGE = 60; public static final int LOAD_PROGRESS_LOADED = 80; @@ -117,6 +118,7 @@ public class Tab { mPluginViews = new ArrayList(); mPluginLayers = new HashMap(); mState = shouldShowProgress(url) ? STATE_SUCCESS : STATE_LOADING; + mLoadProgress = LOAD_PROGRESS_INIT; // At startup, the background is set to a color specified by LayerView // when the LayerView is created. Shortly after, this background color diff --git a/mobile/android/base/toolbar/BrowserToolbar.java b/mobile/android/base/toolbar/BrowserToolbar.java index b26e9e9a233..5d57a599bb1 100644 --- a/mobile/android/base/toolbar/BrowserToolbar.java +++ b/mobile/android/base/toolbar/BrowserToolbar.java @@ -470,8 +470,9 @@ public class BrowserToolbar extends GeckoRelativeLayout // Progress-related handling switch (msg) { case START: - updateProgressVisibility(tab, 0); + updateProgressVisibility(tab, Tab.LOAD_PROGRESS_INIT); // Fall through. + case ADDED: case LOCATION_CHANGE: case LOAD_ERROR: case LOADED: