summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/Controller.java
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2010-12-02 16:09:14 -0800
committerJohn Reck <jreck@google.com>2010-12-03 12:52:31 -0800
commitef0742696d31a3661414089446ff9a3ddd786639 (patch)
treeabfa278fee21281254f636653c7569de560ee855 /src/com/android/browser/Controller.java
parent89f73c1146f474641881e3e20c77cfbfc18fa313 (diff)
downloadpackages_apps_browser-ef0742696d31a3661414089446ff9a3ddd786639.zip
packages_apps_browser-ef0742696d31a3661414089446ff9a3ddd786639.tar.gz
packages_apps_browser-ef0742696d31a3661414089446ff9a3ddd786639.tar.bz2
Change homepage setting handling
Bug: 3247095 Tweaks the setting of the homepage setting. Replaces the "set to..." dialog with 2 buttons, and user can now enter a blank url to get a blank page with title "New Tab". Change-Id: I95bcfcd241db4b9efbde645100d2fd44c980e061
Diffstat (limited to 'src/com/android/browser/Controller.java')
-rw-r--r--src/com/android/browser/Controller.java29
1 files changed, 0 insertions, 29 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 75dd913..b26e9f0 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -108,10 +108,6 @@ public class Controller
private static final int EMPTY_MENU = -1;
- // Keep this initial progress in sync with initialProgressValue (* 100)
- // in ProgressTracker.cpp
- private final static int INITIAL_PROGRESS = 10;
-
// activity requestCode
final static int PREFERENCES_PAGE = 3;
final static int FILE_SELECTED = 4;
@@ -750,10 +746,6 @@ public class Controller
mUi.onPageStarted(tab, url, favicon);
- // Show some progress so that the user knows the page is beginning to
- // load
- onProgressChanged(tab, INITIAL_PROGRESS);
-
// update the bookmark database for favicon
maybeUpdateFavicon(tab, null, url, favicon);
@@ -2247,7 +2239,6 @@ public class Controller
* @param url The URL to load.
*/
protected void loadUrl(WebView view, String url) {
- updateTitleBarForNewLoad(view, url);
view.loadUrl(url);
}
@@ -2258,7 +2249,6 @@ public class Controller
* @param data The UrlData being loaded.
*/
protected void loadUrlDataIn(Tab t, UrlData data) {
- updateTitleBarForNewLoad(t.getWebView(), data.mUrl);
data.loadIn(t);
}
@@ -2279,25 +2269,6 @@ public class Controller
}
/**
- * If the WebView is the top window, update the title bar to reflect
- * loading the new URL. i.e. set its text, clear the favicon (which
- * will be set once the page begins loading), and set the progress to
- * INITIAL_PROGRESS to show that the page has begun to load. Called
- * by loadUrl and loadUrlDataIn.
- * @param view The WebView that is starting a load.
- * @param url The URL that is being loaded.
- */
- private void updateTitleBarForNewLoad(WebView view, String url) {
- if (view == getCurrentTopWebView()) {
- // TODO we should come with a tab and not with a view
- Tab tab = mTabControl.getTabFromView(view);
- setUrlTitle(tab, url, null);
- mUi.setFavicon(tab, null);
- onProgressChanged(tab, INITIAL_PROGRESS);
- }
- }
-
- /**
* Sets a title composed of the URL and the title string.
* @param url The URL of the site being loaded.
* @param title The title of the site being loaded.