summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-06-23 09:45:54 -0700
committerJohn Reck <jreck@google.com>2011-06-27 15:15:43 -0700
commit961d35d6e9cd58d930d8572b91d7e0c9f928f1e8 (patch)
treecba9c51fe52a7ce4457545f9503c897a2a7e4b53 /res/xml
parent32feebd05dc90785194df32b7a14c2e0ceba2b1e (diff)
downloadandroid_packages_apps_Gello-961d35d6e9cd58d930d8572b91d7e0c9f928f1e8.tar.gz
android_packages_apps_Gello-961d35d6e9cd58d930d8572b91d7e0c9f928f1e8.tar.bz2
android_packages_apps_Gello-961d35d6e9cd58d930d8572b91d7e0c9f928f1e8.zip
Move most visited to set homepage
Bug: 4770245 Change-Id: If47b2f308ab3cd4b58dbcbf3a28cdb341481a885
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/general_preferences.xml10
-rw-r--r--res/xml/lab_preferences.xml5
2 files changed, 5 insertions, 10 deletions
diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
index 7b26307f..13f09c12 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 ee00463b..3320ceec 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"