diff options
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 6 | ||||
| -rw-r--r-- | src/com/android/browser/CombinedBookmarkHistoryActivity.java | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index 4c8fc5c..2012f61 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -214,6 +214,8 @@ public class BrowserActivity extends Activity .findViewById(R.id.fullscreen_custom_content); frameLayout.addView(mBrowserFrameLayout, COVER_SCREEN_PARAMS); mTitleBar = new TitleBar(this); + // mTitleBar will be always shown in the fully loaded mode + mTitleBar.setProgress(100); mFakeTitleBar = new TitleBar(this); // Create the tab control and our initial tab @@ -832,9 +834,6 @@ public class BrowserActivity extends Activity if (mWebView == null || mWebView.getScrollY() > getHeight()) { super.draw(canvas); } - // Need to invalidate so that if the scroll position changes, we - // still draw as appropriate. - invalidate(); } } @@ -2659,7 +2658,6 @@ public class BrowserActivity extends Activity // ------------------------------------------------------------------------- void onProgressChanged(WebView view, int newProgress) { - mTitleBar.setProgress(newProgress); mFakeTitleBar.setProgress(newProgress); if (newProgress == 100) { diff --git a/src/com/android/browser/CombinedBookmarkHistoryActivity.java b/src/com/android/browser/CombinedBookmarkHistoryActivity.java index dd29121..c435239 100644 --- a/src/com/android/browser/CombinedBookmarkHistoryActivity.java +++ b/src/com/android/browser/CombinedBookmarkHistoryActivity.java @@ -18,17 +18,15 @@ package com.android.browser; import android.app.Activity; import android.app.TabActivity; -import android.content.ContentResolver; import android.content.Intent; import android.content.res.Resources; import android.graphics.Bitmap; import android.os.AsyncTask; import android.os.Bundle; import android.provider.Browser; -import android.view.Window; +import android.webkit.WebIconDatabase; import android.webkit.WebIconDatabase.IconListener; import android.widget.TabHost; -import android.widget.TabHost.TabSpec; import java.util.HashMap; import java.util.Vector; @@ -125,6 +123,9 @@ public class CombinedBookmarkHistoryActivity extends TabActivity getTabHost().setCurrentTab(2); } + // XXX: Must do this before launching the AsyncTask to avoid a + // potential crash if the icon database has not been created. + WebIconDatabase.getInstance(); // Do this every time we launch the activity in case a new favicon was // added to the webkit db. (new AsyncTask<Void, Void, Void>() { |