summaryrefslogtreecommitdiffstats
path: root/remoting/resources
diff options
context:
space:
mode:
authorshichengfeng <shichengfeng@google.com>2015-07-30 17:27:54 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-31 00:28:34 +0000
commitfc45eccd277933730eef0d14b0cfdb017f1151fe (patch)
treedb333a3e1497546b497a3a632df735ca4b130f68 /remoting/resources
parent94646bf4b4bee8de69e4288b0202b4a020521e23 (diff)
downloadchromium_src-fc45eccd277933730eef0d14b0cfdb017f1151fe.zip
chromium_src-fc45eccd277933730eef0d14b0cfdb017f1151fe.tar.gz
chromium_src-fc45eccd277933730eef0d14b0cfdb017f1151fe.tar.bz2
Android Chromoting: Enable switch between normal desktop activity and Cardboard desktop activity.
1. Remove the configChanges in Manifest. 2. Upload Cardboard icon. 3. Add Cardboard Desktop menu item(including the description string in remoting_strings.grd). Review URL: https://codereview.chromium.org/1256063002 Cr-Commit-Position: refs/heads/master@{#341241}
Diffstat (limited to 'remoting/resources')
-rw-r--r--remoting/resources/remoting_strings.grd3
1 files changed, 3 insertions, 0 deletions
diff --git a/remoting/resources/remoting_strings.grd b/remoting/resources/remoting_strings.grd
index 2a2ea12..ae2fa89 100644
--- a/remoting/resources/remoting_strings.grd
+++ b/remoting/resources/remoting_strings.grd
@@ -571,6 +571,9 @@
</message>
<if expr="is_android or is_ios">
+ <message desc="Pressing this button switches the view of the remote desktop to a Virtual Reality representation which is compatible with Google Cardboard." name="IDS_SHOW_CARDBOARD" formatter_data="android_java">
+ Show Cardboard view.
+ </message>
<message desc="Button to show or hide the on-screen keyboard." name="IDS_SHOW_HIDE_KEYBOARD" formatter_data="android_java">
Show/hide keyboard.
</message>