diff options
| author | 2010-10-25 06:25:24 -0700 | |
|---|---|---|
| committer | 2010-10-25 06:25:24 -0700 | |
| commit | a8dc004aedb67eb394887a10e26d2c8f55ba18f3 (patch) | |
| tree | 7906f5b41031415a0a728de22bdaf5a36f2c2aa0 | |
| parent | 16b7a1b967468e6d3a1b5f2c254320e5909527cc (diff) | |
| parent | fd2d50e82bba6680e5f6ce0d3802b1579e9fe8de (diff) | |
Merge "Provide strings for text selection options in WebView."
| -rw-r--r-- | core/res/res/menu/webview_copy.xml | 13 | ||||
| -rwxr-xr-x | core/res/res/values/strings.xml | 6 |
2 files changed, 14 insertions, 5 deletions
diff --git a/core/res/res/menu/webview_copy.xml b/core/res/res/menu/webview_copy.xml index ed223e798f63..b28c1c10de32 100644 --- a/core/res/res/menu/webview_copy.xml +++ b/core/res/res/menu/webview_copy.xml @@ -17,19 +17,22 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/copy" android:icon="?android:attr/actionModeCopyDrawable" - android:showAsAction="always" + android:title="@string/copy" + android:showAsAction="always|withText" /> <item android:id="@+id/share" android:icon="@drawable/ic_menu_share" - android:showAsAction="always" + android:title="@string/share" + android:showAsAction="always|withText" /> <item android:id="@+id/select_all" - android:icon="@drawable/ic_menu_select_all" - android:showAsAction="always" + android:title="@string/selectAll" + android:showAsAction="always|withText" /> <item android:id="@+id/find" android:icon="@drawable/ic_menu_find" - android:showAsAction="always" + android:title="@string/find" + android:showAsAction="always|withText" /> </menu> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index edb08199b853..d5ea09efc0b0 100755 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -2415,4 +2415,10 @@ <!-- Text for message for an unknown external media state [CHAR LIMIT=NONE] --> <string name="media_unknown_state">External media in unknown state.</string> + <!-- Text for WebView's text selection Action Mode --> + <!-- ActionBar action to share the current selection [CHAR LIMIT=10] --> + <string name="share">Share</string> + <!-- ActionBar action to use the current selection to open the Find on page functionality [CHAR LIMIT=10]--> + <string name="find">Find</string> + </resources> |