diff options
| author | Bo Liu <boliu@google.com> | 2013-12-05 18:01:50 -0800 |
|---|---|---|
| committer | Bo Liu <boliu@google.com> | 2013-12-05 18:01:50 -0800 |
| commit | 3fbc9545f7fda99adedd2216becd106d6b0c9ccf (patch) | |
| tree | 7b316d0fb6616cc0611e45f76679f5cfcc8862c4 /chromium/overlay/frameworks | |
| parent | c673dbdbfa853ed101dfc9193a34c14b5134cc78 (diff) | |
| download | android_frameworks_webview-3fbc9545f7fda99adedd2216becd106d6b0c9ccf.tar.gz android_frameworks_webview-3fbc9545f7fda99adedd2216becd106d6b0c9ccf.tar.bz2 android_frameworks_webview-3fbc9545f7fda99adedd2216becd106d6b0c9ccf.zip | |
Add resource after chromium crrev.com/r239076
Change-Id: I73c193454cb9cb2e8a77981675395e9c06844ae2
Diffstat (limited to 'chromium/overlay/frameworks')
3 files changed, 5 insertions, 0 deletions
diff --git a/chromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml b/chromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml index 07999f7..8bfecdd 100644 --- a/chromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml +++ b/chromium/overlay/frameworks/base/core/res/res/values/chromium-resources.xml @@ -79,6 +79,7 @@ <add-resource type="string" name="webviewchromium_date_picker_dialog_set" /> <add-resource type="string" name="webviewchromium_date_picker_dialog_title" /> <add-resource type="string" name="webviewchromium_date_time_picker_dialog_title" /> + <add-resource type="string" name="webviewchromium_copy_to_clipboard_failure_message" /> <add-resource type="string" name="webviewchromium_low_memory_error" /> <add-resource type="string" name="webviewchromium_media_player_error_button" /> <add-resource type="string" name="webviewchromium_media_player_error_text_invalid_progressive_playback" /> diff --git a/chromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml b/chromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml index 2f87a54..e61ff98 100644 --- a/chromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml +++ b/chromium/overlay/frameworks/base/core/res/res/values/chromium-symbols.xml @@ -85,6 +85,7 @@ <java-symbol type="string" name="webviewchromium_date_picker_dialog_set" /> <java-symbol type="string" name="webviewchromium_date_picker_dialog_title" /> <java-symbol type="string" name="webviewchromium_date_time_picker_dialog_title" /> + <java-symbol type="string" name="webviewchromium_copy_to_clipboard_failure_message" /> <java-symbol type="string" name="webviewchromium_low_memory_error" /> <java-symbol type="string" name="webviewchromium_media_player_error_button" /> <java-symbol type="string" name="webviewchromium_media_player_error_text_invalid_progressive_playback" /> diff --git a/chromium/overlay/frameworks/base/core/res/res/values/strings.xml b/chromium/overlay/frameworks/base/core/res/res/values/strings.xml index a54a91d..13a3be8 100644 --- a/chromium/overlay/frameworks/base/core/res/res/values/strings.xml +++ b/chromium/overlay/frameworks/base/core/res/res/values/strings.xml @@ -109,6 +109,9 @@ <!-- Label for Color Picker color button. --> <string name="webviewchromium_color_picker_button_white">White</string> + <!-- Notification for when copying to the clipboard fails. [CHAR-LIMIT=64] --> + <string name="webviewchromium_copy_to_clipboard_failure_message">Failed to copy to the clipboard</string> + <!-- Error shown when the browser is restarted due to low memory during a file picker operation. [CHAR-LIMIT=NONE] --> <string name="webviewchromium_low_memory_error">Unable to complete previous operation due to low memory</string> |