diff options
| author | Michael Kolb <kolby@google.com> | 2012-05-16 13:17:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-16 13:17:34 -0700 |
| commit | 9737677e3b8b44f548f2026eb1edc9ffcf8579d1 (patch) | |
| tree | 8ef08f4d4afdac49424535f62a9192629d41e4e2 /res/xml | |
| parent | 4a6d851f150a5a5c30fce63985333182138e5f02 (diff) | |
| parent | b9b293119d3a4a94b5d05d8e555070738ca3c36f (diff) | |
| download | packages_apps_browser-9737677e3b8b44f548f2026eb1edc9ffcf8579d1.zip packages_apps_browser-9737677e3b8b44f548f2026eb1edc9ffcf8579d1.tar.gz packages_apps_browser-9737677e3b8b44f548f2026eb1edc9ffcf8579d1.tar.bz2 | |
am b9b29311: Merge "Add setting to control tabs per app behavior" into jb-dev
* commit 'b9b293119d3a4a94b5d05d8e555070738ca3c36f':
Add setting to control tabs per app behavior
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/advanced_preferences.xml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/res/xml/advanced_preferences.xml b/res/xml/advanced_preferences.xml index 4c5ecdf..e292b7d 100644 --- a/res/xml/advanced_preferences.xml +++ b/res/xml/advanced_preferences.xml @@ -36,6 +36,11 @@ android:defaultValue="true" android:title="@string/pref_content_javascript" /> + <CheckBoxPreference + android:key="allow_apptabs" + android:defaultValue="false" + android:title="@string/pref_allow_apptabs" /> + <ListPreference android:key="plugin_state" android:title="@string/pref_content_plugins" @@ -91,7 +96,7 @@ android:key="reset_default_preferences" android:title="@string/pref_extras_reset_default" android:summary="@string/pref_extras_reset_default_summary" - android:dialogMessage="@string/pref_extras_reset_default_dlg" + android:dialogMessage="@string/pref_extras_reset_default_dlg" android:dialogIcon="@android:drawable/ic_dialog_alert" /> </PreferenceCategory> |