diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 21:08:40 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 21:08:40 +0000 |
| commit | 34ebfd704de4599b9ecaf357e5c9fb1f4e19f665 (patch) | |
| tree | 75ff2db60005896136779878e8f4d0ee0df1af30 /chrome/android | |
| parent | 79a27460eca0f96b7566d826db4615f2da19fc86 (diff) | |
| download | chromium_src-34ebfd704de4599b9ecaf357e5c9fb1f4e19f665.zip chromium_src-34ebfd704de4599b9ecaf357e5c9fb1f4e19f665.tar.gz chromium_src-34ebfd704de4599b9ecaf357e5c9fb1f4e19f665.tar.bz2 | |
[Android] Upstream selection action bar for text press selection.
There's some duplicate resources between content shell and chromium
testshell but it's unavoidable until crbug.com/136704 is solved.
Includes some misc cleanup of ContentViewCore
BUG=157182
Review URL: https://chromiumcodereview.appspot.com/11228036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163674 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/android')
| -rw-r--r-- | chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java | 4 | ||||
| -rw-r--r-- | chrome/android/testshell/res/values/strings.xml | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java index 5887a69..26c1fc0 100644 --- a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java +++ b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java @@ -118,10 +118,14 @@ public class ChromiumTestShellActivity extends Activity { private void initializeContentViewResources() { AppResource.DIMENSION_LINK_PREVIEW_OVERLAY_RADIUS = R.dimen.link_preview_overlay_radius; + AppResource.DRAWABLE_ICON_ACTION_BAR_SHARE = R.drawable.ic_menu_share_holo_light; + AppResource.DRAWABLE_ICON_ACTION_BAR_WEB_SEARCH = R.drawable.ic_menu_search_holo_light; AppResource.DRAWABLE_LINK_PREVIEW_POPUP_OVERLAY = R.drawable.popup_zoomer_overlay; AppResource.ID_AUTOFILL_LABEL = R.id.autofill_label; AppResource.ID_AUTOFILL_NAME = R.id.autofill_name; AppResource.LAYOUT_AUTOFILL_TEXT = R.layout.autofill_text; + AppResource.STRING_ACTION_BAR_SHARE = R.string.action_bar_share; + AppResource.STRING_ACTION_BAR_WEB_SEARCH = R.string.action_bar_search; AppResource.STRING_CONTENT_VIEW_CONTENT_DESCRIPTION = R.string.accessibility_content_view; AppResource.STRING_MEDIA_PLAYER_MESSAGE_PLAYBACK_ERROR = R.string.media_player_error_text_invalid_progressive_playback; diff --git a/chrome/android/testshell/res/values/strings.xml b/chrome/android/testshell/res/values/strings.xml index c90029e..a25a193 100644 --- a/chrome/android/testshell/res/values/strings.xml +++ b/chrome/android/testshell/res/values/strings.xml @@ -7,11 +7,13 @@ --> <resources> - <string name="url_hint">Type URL Here</string> - <string name="accessibility_content_view">Web View</string> + <!-- Action Bar --> + <string name="action_bar_share">Share</string> + <string name="action_bar_search">Search</string> + <!-- Media Player --> <string name="media_player_error_title">Cannot play video</string> <string name="media_player_error_text_invalid_progressive_playback"> |