diff options
Diffstat (limited to 'src/com/android/browser')
| -rw-r--r-- | src/com/android/browser/TabBar.java | 33 | ||||
| -rw-r--r-- | src/com/android/browser/XLargeUi.java | 8 |
2 files changed, 10 insertions, 31 deletions
diff --git a/src/com/android/browser/TabBar.java b/src/com/android/browser/TabBar.java index d549ac347..bd17c747e 100644 --- a/src/com/android/browser/TabBar.java +++ b/src/com/android/browser/TabBar.java @@ -31,10 +31,7 @@ import android.graphics.Matrix; import android.graphics.Paint; import android.graphics.Path; import android.graphics.Shader; -import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import android.graphics.drawable.LayerDrawable; -import android.graphics.drawable.PaintDrawable; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; @@ -253,7 +250,6 @@ public class TabBar extends LinearLayout implements OnClickListener { ImageView mLock; ImageView mClose; boolean mSelected; - boolean mInLoad; Path mPath; Path mFocusPath; int[] mWindowPos; @@ -281,7 +277,6 @@ public class TabBar extends LinearLayout implements OnClickListener { mIncognito = mTabContent.findViewById(R.id.incognito); mSnapshot = mTabContent.findViewById(R.id.snapshot); mSelected = false; - mInLoad = false; // update the status updateFromTab(); } @@ -299,7 +294,6 @@ public class TabBar extends LinearLayout implements OnClickListener { displayTitle = mTab.getUrl(); } setDisplayTitle(displayTitle); - setProgress(mTab.getLoadProgress()); if (mTab.getFavicon() != null) { setFavicon(mUi.getFaviconDrawable(mTab.getFavicon())); } @@ -352,16 +346,6 @@ public class TabBar extends LinearLayout implements OnClickListener { } } - void setProgress(int newProgress) { - if (newProgress >= PROGRESS_MAX) { - mInLoad = false; - } else { - if (!mInLoad && getWindowToken() != null) { - mInLoad = true; - } - } - } - private void closeTab() { if (mTab == mTabControl.getCurrentTab()) { mUiController.closeCurrentTab(); @@ -503,10 +487,6 @@ public class TabBar extends LinearLayout implements OnClickListener { public void onSetActiveTab(Tab tab) { mTabs.setSelectedTab(mTabControl.getTabPosition(tab)); - TabView tv = mTabMap.get(tab); - if (tv != null) { - tv.setProgress(tv.mTab.getLoadProgress()); - } } public void onFavicon(Tab tab, Bitmap favicon) { @@ -521,13 +501,6 @@ public class TabBar extends LinearLayout implements OnClickListener { animateTabIn(tab, tv); } - public void onProgress(Tab tab, int progress) { - TabView tv = mTabMap.get(tab); - if (tv != null) { - tv.setProgress(progress); - } - } - public void onRemoveTab(Tab tab) { TabView tv = mTabMap.get(tab); if (tv != null) { @@ -550,9 +523,9 @@ public class TabBar extends LinearLayout implements OnClickListener { } private boolean isLoading() { - TabView tv = mTabMap.get(mTabControl.getCurrentTab()); - if (tv != null) { - return tv.mInLoad; + Tab tab = mTabControl.getCurrentTab(); + if (tab != null) { + return tab.inPageLoad(); } else { return false; } diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java index c828df420..17153b6bb 100644 --- a/src/com/android/browser/XLargeUi.java +++ b/src/com/android/browser/XLargeUi.java @@ -162,9 +162,15 @@ public class XLargeUi extends BaseUi { @Override public void onProgressChanged(Tab tab) { int progress = tab.getLoadProgress(); - mTabBar.onProgress(tab, progress); if (tab.inForeground()) { mTitleBar.setProgress(progress); + if (mUseQuickControls) { + if (progress == 100) { + mTitleBar.setShowProgressOnly(false); + } else if (!mTitleBar.isEditingUrl()) { + mTitleBar.setShowProgressOnly(true); + } + } } } |