diff options
author | Bijan Amirzada <bijana@codeaurora.org> | 2014-02-26 17:15:46 -0800 |
---|---|---|
committer | Bijan Amirzada <bijana@codeaurora.org> | 2014-03-04 14:30:51 -0800 |
commit | 9b1e988e881319bc0c4a7642653685781269d866 (patch) | |
tree | f4c8761db3fd80b7e37516d1fe006519dbeeb8bf /res/xml | |
parent | 69b30beb16df7916c7679ed69d70e3ebcdeb2085 (diff) | |
download | android_packages_apps_Gello-9b1e988e881319bc0c4a7642653685781269d866.tar.gz android_packages_apps_Gello-9b1e988e881319bc0c4a7642653685781269d866.tar.bz2 android_packages_apps_Gello-9b1e988e881319bc0c4a7642653685781269d866.zip |
Added modified files to consume SWE
Change-Id: I959781dad2a983de6be6ab07f418006a5708c976
Diffstat (limited to 'res/xml')
-rw-r--r-- | res/xml/accessibility_preferences.xml | 18 | ||||
-rw-r--r-- | res/xml/advanced_preferences.xml | 9 | ||||
-rw-r--r-- | res/xml/bookmarkthumbnailwidget_info.xml | 2 | ||||
-rw-r--r-- | res/xml/general_preferences.xml | 4 | ||||
-rw-r--r-- | res/xml/preference_headers.xml | 12 | ||||
-rw-r--r-- | res/xml/privacy_security_preferences.xml | 12 |
6 files changed, 31 insertions, 26 deletions
diff --git a/res/xml/accessibility_preferences.xml b/res/xml/accessibility_preferences.xml index 8eca9176..d77dd278 100644 --- a/res/xml/accessibility_preferences.xml +++ b/res/xml/accessibility_preferences.xml @@ -23,31 +23,31 @@ android:defaultValue="false" /> <PreferenceCategory android:title="@string/pref_font_size_category"> - <com.android.browser.preferences.FontSizePreview + <com.android.swe.browser.preferences.FontSizePreview android:title="@string/preview" /> - - <com.android.browser.preferences.SeekBarSummaryPreference + <com.android.swe.browser.preferences.SeekBarSummaryPreference android:key="text_zoom" android:title="@string/pref_text_zoom" android:defaultValue="10" android:max="30" /> - <com.android.browser.preferences.SeekBarSummaryPreference + <com.android.swe.browser.preferences.SeekBarSummaryPreference android:key="double_tap_zoom" android:title="@string/pref_zoom_on_double_tap" android:defaultValue="5" android:max="10" /> - <com.android.browser.preferences.SeekBarSummaryPreference + <com.android.swe.browser.preferences.SeekBarSummaryPreference android:key="min_font_size" android:title="@string/pref_min_font_size" android:defaultValue="0" android:max="20" /> - </PreferenceCategory> + <!-- // SWE_TODO: Commenting out inverted rendering settings <PreferenceCategory android:title="@string/pref_inverted_category"> - <com.android.browser.preferences.InvertedContrastPreview + + <com.android.swe.browser.preferences.InvertedContrastPreview android:title="@string/preview" /> <CheckBoxPreference @@ -56,13 +56,13 @@ android:title="@string/pref_inverted" android:summary="@string/pref_inverted_summary" /> - <com.android.browser.preferences.SeekBarSummaryPreference + <com.android.swe.browser.preferences.SeekBarSummaryPreference android:key="inverted_contrast" android:title="@string/pref_inverted_contrast" android:dependency="inverted" android:defaultValue="0" android:max="20" /> - </PreferenceCategory> + --> </PreferenceScreen> diff --git a/res/xml/advanced_preferences.xml b/res/xml/advanced_preferences.xml index e292b7d8..b4daa4b6 100644 --- a/res/xml/advanced_preferences.xml +++ b/res/xml/advanced_preferences.xml @@ -18,7 +18,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"> <!-- Entries and values in this list are set dynamically. --> - <com.android.browser.search.SearchEnginePreference + <com.android.swe.browser.search.SearchEnginePreference android:key="search_engine" android:title="@string/pref_content_search_engine" android:defaultValue="google" @@ -37,6 +37,11 @@ android:title="@string/pref_content_javascript" /> <CheckBoxPreference + android:key="enable_memory_monitor" + android:defaultValue="true" + android:title="@string/pref_memory_monitor" /> + + <CheckBoxPreference android:key="allow_apptabs" android:defaultValue="false" android:title="@string/pref_allow_apptabs" /> @@ -92,7 +97,7 @@ </PreferenceCategory> <PreferenceCategory android:title="@string/pref_extras_reset_default_title"> - <com.android.browser.BrowserYesNoPreference + <com.android.swe.browser.BrowserYesNoPreference android:key="reset_default_preferences" android:title="@string/pref_extras_reset_default" android:summary="@string/pref_extras_reset_default_summary" diff --git a/res/xml/bookmarkthumbnailwidget_info.xml b/res/xml/bookmarkthumbnailwidget_info.xml index f8ca797c..b4c328e0 100644 --- a/res/xml/bookmarkthumbnailwidget_info.xml +++ b/res/xml/bookmarkthumbnailwidget_info.xml @@ -25,5 +25,5 @@ android:previewImage="@drawable/browser_widget_preview" android:initialLayout="@layout/bookmarkthumbnailwidget" android:resizeMode="vertical|horizontal" - android:configure="com.android.browser.widget.BookmarkWidgetConfigure"> + android:configure="com.android.swe.browser.widget.BookmarkWidgetConfigure"> </appwidget-provider> diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml index 6f42d3d7..aad8a62f 100644 --- a/res/xml/general_preferences.xml +++ b/res/xml/general_preferences.xml @@ -16,7 +16,7 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - <com.android.browser.preferences.NonformattingListPreference + <com.android.swe.browser.preferences.NonformattingListPreference android:key="homepage_picker" android:entries="@array/pref_homepage_choices" android:entryValues="@array/pref_homepage_values" @@ -30,7 +30,7 @@ /> <PreferenceScreen - android:fragment="com.android.browser.AutoFillSettingsFragment" + android:fragment="com.android.swe.browser.AutoFillSettingsFragment" android:key="autofill_profile" android:title="@string/pref_autofill_profile_editor" android:summary="@string/pref_autofill_profile_editor_summary" /> diff --git a/res/xml/preference_headers.xml b/res/xml/preference_headers.xml index 2c80835b..484d305f 100644 --- a/res/xml/preference_headers.xml +++ b/res/xml/preference_headers.xml @@ -16,27 +16,27 @@ <preference-headers xmlns:android="http://schemas.android.com/apk/res/android"> - <header android:fragment="com.android.browser.preferences.GeneralPreferencesFragment" + <header android:fragment="com.android.swe.browser.preferences.GeneralPreferencesFragment" android:title="@string/pref_general_title" /> - <header android:fragment="com.android.browser.preferences.PrivacySecurityPreferencesFragment" + <header android:fragment="com.android.swe.browser.preferences.PrivacySecurityPreferencesFragment" android:title="@string/pref_privacy_security_title" /> - <header android:fragment="com.android.browser.preferences.AccessibilityPreferencesFragment" + <header android:fragment="com.android.swe.browser.preferences.AccessibilityPreferencesFragment" android:title="@string/pref_accessibility_title" /> - <header android:fragment="com.android.browser.preferences.AdvancedPreferencesFragment" + <header android:fragment="com.android.swe.browser.preferences.AdvancedPreferencesFragment" android:title="@string/pref_extras_title" /> - <header android:fragment="com.android.browser.preferences.BandwidthPreferencesFragment" + <header android:fragment="com.android.swe.browser.preferences.BandwidthPreferencesFragment" android:title="@string/pref_data_title" /> - <header android:fragment="com.android.browser.preferences.LabPreferencesFragment" + <header android:fragment="com.android.swe.browser.preferences.LabPreferencesFragment" android:title="@string/pref_lab_title" /> diff --git a/res/xml/privacy_security_preferences.xml b/res/xml/privacy_security_preferences.xml index 26336000..dba55149 100644 --- a/res/xml/privacy_security_preferences.xml +++ b/res/xml/privacy_security_preferences.xml @@ -17,14 +17,14 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - <com.android.browser.BrowserYesNoPreference + <com.android.swe.browser.BrowserYesNoPreference android:key="privacy_clear_cache" android:title="@string/pref_privacy_clear_cache" android:summary="@string/pref_privacy_clear_cache_summary" android:dialogMessage="@string/pref_privacy_clear_cache_dlg" android:dialogIcon="@android:drawable/ic_dialog_alert" /> - <com.android.browser.BrowserYesNoPreference + <com.android.swe.browser.BrowserYesNoPreference android:key="privacy_clear_history" android:title="@string/pref_privacy_clear_history" android:summary="@string/pref_privacy_clear_history_summary" @@ -44,7 +44,7 @@ android:title="@string/pref_security_accept_cookies" android:summary="@string/pref_security_accept_cookies_summary" /> - <com.android.browser.BrowserYesNoPreference + <com.android.swe.browser.BrowserYesNoPreference android:key="privacy_clear_cookies" android:title="@string/pref_privacy_clear_cookies" android:summary="@string/pref_privacy_clear_cookies_summary" @@ -59,7 +59,7 @@ android:title="@string/pref_security_save_form_data" android:summary="@string/pref_security_save_form_data_summary" /> - <com.android.browser.BrowserYesNoPreference + <com.android.swe.browser.BrowserYesNoPreference android:key="privacy_clear_form_data" android:title="@string/pref_privacy_clear_form_data" android:summary="@string/pref_privacy_clear_form_data_summary" @@ -74,7 +74,7 @@ android:title="@string/pref_privacy_enable_geolocation" android:summary="@string/pref_privacy_enable_geolocation_summary" /> - <com.android.browser.BrowserYesNoPreference + <com.android.swe.browser.BrowserYesNoPreference android:key="privacy_clear_geolocation_access" android:dependency="enable_geolocation" android:title="@string/pref_privacy_clear_geolocation_access" @@ -90,7 +90,7 @@ android:title="@string/pref_security_remember_passwords" android:summary="@string/pref_security_remember_passwords_summary" /> - <com.android.browser.BrowserYesNoPreference + <com.android.swe.browser.BrowserYesNoPreference android:key="privacy_clear_passwords" android:title="@string/pref_privacy_clear_passwords" android:summary="@string/pref_privacy_clear_passwords_summary" |