diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/suggestion_item.xml | 2 | ||||
| -rw-r--r-- | res/menu/snapshot_go_live.xml (renamed from res/menu/title_context.xml) | 14 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 | ||||
| -rw-r--r-- | res/xml/debug_preferences.xml | 9 |
4 files changed, 17 insertions, 12 deletions
diff --git a/res/layout/suggestion_item.xml b/res/layout/suggestion_item.xml index 2bd5466..2def735 100644 --- a/res/layout/suggestion_item.xml +++ b/res/layout/suggestion_item.xml @@ -50,7 +50,7 @@ <TextView android:id="@android:id/text1" style="@style/SuggestionLineMedium" - android:singleLine="true" + android:maxLines="1" android:layout_width="match_parent" android:layout_height="wrap_content" /> <TextView diff --git a/res/menu/title_context.xml b/res/menu/snapshot_go_live.xml index a60f102..aa6b38e 100644 --- a/res/menu/title_context.xml +++ b/res/menu/snapshot_go_live.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 The Android Open Source Project +<!-- Copyright (C) 2011 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,12 +15,8 @@ --> <menu xmlns:android="http://schemas.android.com/apk/res/android"> - <!-- These are for the context menu for the title bar. Note that we need a - different item from share_page_menu_id, which looks at the top - window (possibly a subwindow), because this should be the main - window.--> - <item android:id="@+id/title_bar_share_page_url" - android:title="@string/share_page"/> - <item android:id="@+id/title_bar_copy_page_url" - android:title="@string/copy_page_url"/> + <item + android:id="@+id/snapshot_go_live" + android:title="@string/snapshot_go_live" /> </menu> + diff --git a/res/values/strings.xml b/res/values/strings.xml index f4086ea..41b9831 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -573,6 +573,8 @@ <!-- Do not tranlsate. Development option --> <string name="pref_development_hardware_accel" translatable="false">Enable OpenGL Rendering</string> <!-- Do not tranlsate. Development option --> + <string name="pref_development_hardware_accel_skia" translatable="false">Enable HW Accelerated Skia</string> + <!-- Do not tranlsate. Development option --> <string name="pref_development_visual_indicator" translatable="false">Enable Visual Indicator</string> <!-- Do not tranlsate. Development option --> <string name="js_engine_flags" translatable="false">Set JS flags</string> @@ -1016,4 +1018,6 @@ <string name="empty_snapshots_folder">There are no saved pages.</string> <!-- Menu option to delete the currently selected saved page [CHAR LIMIT=50] --> <string name="remove_snapshot">Delete saved page</string> + <!-- Popup menu option to load the live version of a saved page [CHAR LIMIT=20] --> + <string name="snapshot_go_live">Go live</string> </resources> diff --git a/res/xml/debug_preferences.xml b/res/xml/debug_preferences.xml index 1fc4f4c..2d15ab2 100644 --- a/res/xml/debug_preferences.xml +++ b/res/xml/debug_preferences.xml @@ -22,6 +22,11 @@ android:defaultValue="true" android:title="@string/pref_development_hardware_accel" /> + <CheckBoxPreference + android:key="enable_hardware_accel_skia" + android:defaultValue="false" + android:title="@string/pref_development_hardware_accel_skia" /> + <ListPreference android:key="user_agent" android:title="@string/pref_development_uastring" @@ -29,13 +34,13 @@ android:entryValues="@array/pref_development_ua_values" android:defaultValue="0"/> - <!-- The javascript console is enabled by default when the user has - also enabled debug mode by navigating to about:debug. --> <CheckBoxPreference android:key="enable_visual_indicator" android:defaultValue="false" android:title="@string/pref_development_visual_indicator" /> + <!-- The javascript console is enabled by default when the user has + also enabled debug mode by navigating to about:debug. --> <CheckBoxPreference android:key="javascript_console" android:defaultValue="true" |