commit 961d35d6e9cd58d930d8572b91d7e0c9f928f1e8
author John Reck <jreck@google.com> Thu Jun 23 09:45:54 2011 -0700
committer John Reck <jreck@google.com> Mon Jun 27 15:15:43 2011 -0700
tree cba9c51fe52a7ce4457545f9503c897a2a7e4b53
parent 32feebd05dc90785194df32b7a14c2e0ceba2b1e

Move most visited to set homepage

 Bug: 4770245

Change-Id: If47b2f308ab3cd4b58dbcbf3a28cdb341481a885

src/com/android/browser/BrowserSettings.java

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index fae59e2..4928e61 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -279,7 +279,7 @@
         }
     }
 
-    static String getFactoryResetHomeUrl(Context context) {
+    public static String getFactoryResetHomeUrl(Context context) {
         String url = context.getResources().getString(R.string.homepage_base);
         if (url.indexOf("{CID}") != -1) {
             url = url.replace("{CID}",
@@ -545,9 +545,6 @@
     // -----------------------------
 
     public String getHomePage() {
-        if (useMostVisitedHomepage()) {
-            return HomeProvider.MOST_VISITED;
-        }
         return mPrefs.getString(PREF_HOMEPAGE, getFactoryResetHomeUrl(mContext));
     }
 
@@ -657,7 +654,7 @@
     }
 
     public boolean useMostVisitedHomepage() {
-        return mPrefs.getBoolean(PREF_USE_MOST_VISITED_HOMEPAGE, false);
+        return HomeProvider.MOST_VISITED.equals(getHomePage());
     }
 
     public boolean useInstantSearch() {