| Index: remoting/android/java/src/org/chromium/chromoting/Desktop.java
|
| diff --git a/remoting/android/java/src/org/chromium/chromoting/Desktop.java b/remoting/android/java/src/org/chromium/chromoting/Desktop.java
|
| index a7762fa7610ad3aa0ba4c5b526aab3cc3b3660d9..7135492743d024b9ea8c8791052d2e45f86bef06 100644
|
| --- a/remoting/android/java/src/org/chromium/chromoting/Desktop.java
|
| +++ b/remoting/android/java/src/org/chromium/chromoting/Desktop.java
|
| @@ -51,7 +51,11 @@ public class Desktop extends ActionBarActivity implements View.OnSystemUiVisibil
|
| mOverlayButton = (ImageButton) findViewById(R.id.desktop_overlay_button);
|
| mRemoteHostDesktop.setDesktop(this);
|
|
|
| - // Ensure the button is initially hidden.
|
| + // For this Activity, the home button in the action bar acts as a Disconnect button, so
|
| + // set the description for accessibility/screen readers.
|
| + getSupportActionBar().setHomeActionContentDescription(R.string.disconnect_myself_button);
|
| +
|
| + // Ensure the overlay button is initially hidden.
|
| showActionBar();
|
|
|
| View decorView = getWindow().getDecorView();
|
| @@ -193,7 +197,7 @@ public class Desktop extends ActionBarActivity implements View.OnSystemUiVisibil
|
| hideActionBar();
|
| return true;
|
| }
|
| - if (id == R.id.actionbar_disconnect) {
|
| + if (id == R.id.actionbar_disconnect || id == android.R.id.home) {
|
| JniInterface.disconnectFromHost();
|
| return true;
|
| }
|
|
|