diff options
| author | John Reck <jreck@google.com> | 2012-04-23 14:50:09 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2012-04-23 17:57:54 -0700 |
| commit | 3ad8d5cf0911ba015e019bc75e8fb13c091efe0e (patch) | |
| tree | d5effce7657453109ca3ec4b9be83bc4bf4441e9 /res | |
| parent | d6207eee8f87bbbfbc57bb4674b29e80c92e9d3b (diff) | |
| download | packages_apps_browser-3ad8d5cf0911ba015e019bc75e8fb13c091efe0e.zip packages_apps_browser-3ad8d5cf0911ba015e019bc75e8fb13c091efe0e.tar.gz packages_apps_browser-3ad8d5cf0911ba015e019bc75e8fb13c091efe0e.tar.bz2 | |
Bookmark page changes
Bug: 6372933
Fix a race condition between update & destroy
Fix update path
Add some extra debug support
Change-Id: I66a450e175b22d992de97d5bc24200961144412a
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/xml/debug_preferences.xml | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 90ec428..8adc741 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -591,6 +591,8 @@ <string name="pref_development_error_console" translatable="false">Show JavaScript Console</string> <!-- Do not translate. Development option to reset the prologin time [CHAR LIMIT=20] --> <string name="pref_development_reset_prelogin" translatable="false">Reset prelogin</string> + <!-- Do not translate. Development option to add more bookmarks [CHAR LIMIT=20] --> + <string name="pref_development_add_bookmarks" tranlsatable="false">Moar bookmarks!</string> <!-- Settings screen, setting option name --> <string name="pref_default_text_encoding">Text encoding</string> <!-- Options in the Default encoding dialog box --> diff --git a/res/xml/debug_preferences.xml b/res/xml/debug_preferences.xml index 029bc4f..1653549 100644 --- a/res/xml/debug_preferences.xml +++ b/res/xml/debug_preferences.xml @@ -91,4 +91,8 @@ android:key="reset_prelogin" android:title="@string/pref_development_reset_prelogin" /> + <Preference + android:key="add_bookmarks" + android:title="@string/pref_development_add_bookmarks" /> + </PreferenceScreen> |