summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorlambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-13 23:09:09 +0000
committerlambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-13 23:09:09 +0000
commit53cbcbba8d11022e3daa4dbf32bacc6b549e52ed (patch)
tree40896240bc20579894cf56b7de0a8b81b6b3549e /remoting
parent6fc51a48eb77e9bb8a20e84cb531a2d1eaf7327a (diff)
downloadchromium_src-53cbcbba8d11022e3daa4dbf32bacc6b549e52ed.zip
chromium_src-53cbcbba8d11022e3daa4dbf32bacc6b549e52ed.tar.gz
chromium_src-53cbcbba8d11022e3daa4dbf32bacc6b549e52ed.tar.bz2
Add Send Ctrl-Alt-Del menu-item to Android Chromoting client
BUG=333129 Review URL: https://codereview.chromium.org/133123007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244607 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/android/java/src/org/chromium/chromoting/Desktop.java15
-rw-r--r--remoting/resources/menu/desktop_actionbar.xml3
-rw-r--r--remoting/resources/strings.xml1
3 files changed, 19 insertions, 0 deletions
diff --git a/remoting/android/java/src/org/chromium/chromoting/Desktop.java b/remoting/android/java/src/org/chromium/chromoting/Desktop.java
index c3131a8..0eedf3a 100644
--- a/remoting/android/java/src/org/chromium/chromoting/Desktop.java
+++ b/remoting/android/java/src/org/chromium/chromoting/Desktop.java
@@ -63,6 +63,21 @@ public class Desktop extends Activity {
case R.id.actionbar_disconnect:
JniInterface.disconnectFromHost();
return true;
+ case R.id.actionbar_send_ctrl_alt_del:
+ {
+ int[] keys = {
+ KeyEvent.KEYCODE_CTRL_LEFT,
+ KeyEvent.KEYCODE_ALT_LEFT,
+ KeyEvent.KEYCODE_FORWARD_DEL,
+ };
+ for (int key : keys) {
+ JniInterface.keyboardAction(key, true);
+ }
+ for (int key : keys) {
+ JniInterface.keyboardAction(key, false);
+ }
+ }
+ return true;
default:
return super.onOptionsItemSelected(item);
}
diff --git a/remoting/resources/menu/desktop_actionbar.xml b/remoting/resources/menu/desktop_actionbar.xml
index 1e482d3..0efb3fb 100644
--- a/remoting/resources/menu/desktop_actionbar.xml
+++ b/remoting/resources/menu/desktop_actionbar.xml
@@ -9,6 +9,9 @@
android:title="@string/actionbar_hide"
android:icon="@android:drawable/ic_menu_close_clear_cancel"
android:showAsAction="ifRoom|withText"/>
+ <item android:id="@+id/actionbar_send_ctrl_alt_del"
+ android:title="@string/actionbar_send_ctrl_alt_del"
+ android:showAsAction="withText"/>
<item android:id="@+id/actionbar_disconnect"
android:title="@string/actionbar_disconnect"
android:showAsAction="withText"/>
diff --git a/remoting/resources/strings.xml b/remoting/resources/strings.xml
index 825cbf7..f196fae 100644
--- a/remoting/resources/strings.xml
+++ b/remoting/resources/strings.xml
@@ -23,6 +23,7 @@
<string name="actionbar_disconnect">Disconnect</string>
<string name="actionbar_hide">Hide</string>
<string name="actionbar_keyboard">Keyboard</string>
+ <string name="actionbar_send_ctrl_alt_del">Send Ctrl-Alt-Del</string>
<!--Informative messages-->
<string name="msg_pin_canceled">No PIN was provided, so the connection attempt was canceled</string>