From 961d35d6e9cd58d930d8572b91d7e0c9f928f1e8 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Thu, 23 Jun 2011 09:45:54 -0700
Subject: Move most visited to set homepage

 Bug: 4770245

Change-Id: If47b2f308ab3cd4b58dbcbf3a28cdb341481a885
---
 res/xml/general_preferences.xml | 10 +++++-----
 res/xml/lab_preferences.xml     |  5 -----
 2 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'res/xml')

diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
index 7b26307..13f09c1 100644
--- a/res/xml/general_preferences.xml
+++ b/res/xml/general_preferences.xml
@@ -16,11 +16,11 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <com.android.browser.BrowserHomepagePreference
-            android:key="homepage"
-            android:title="@string/pref_content_homepage"
-            android:hint="@string/http"
-            android:inputType="textUri|textMultiLine" />
+    <ListPreference
+        android:key="homepage_picker"
+        android:entries="@array/pref_homepage_choices"
+        android:entryValues="@array/pref_homepage_values"
+        android:title="@string/pref_content_homepage" />
 
     <PreferenceCategory android:title="@string/pref_general_autofill_title">
         <CheckBoxPreference android:key="autofill_enabled"
diff --git a/res/xml/lab_preferences.xml b/res/xml/lab_preferences.xml
index ee00463..3320cee 100644
--- a/res/xml/lab_preferences.xml
+++ b/res/xml/lab_preferences.xml
@@ -22,11 +22,6 @@
         android:title="@string/pref_lab_quick_controls"
         android:summary="@string/pref_lab_quick_controls_summary" />
     <CheckBoxPreference
-        android:key="use_most_visited_homepage"
-        android:defaultValue="false"
-        android:title="@string/pref_lab_most_visited_homepage"
-        android:summary="@string/pref_lab_most_visited_homepage_summary" />
-    <CheckBoxPreference
         android:key="fullscreen"
         android:defaultValue="false"
         android:title="@string/pref_lab_fullscreen"
-- 
cgit v1.1