| Index: remoting/android/java/res/menu/desktop_actionbar.xml
|
| diff --git a/remoting/android/java/res/menu/desktop_actionbar.xml b/remoting/android/java/res/menu/desktop_actionbar.xml
|
| index 3b4cc64ba02e95b8b71be2ebfce395af2319751c..04f249d874e42e0b3ae704aff7ac39b9258379ae 100644
|
| --- a/remoting/android/java/res/menu/desktop_actionbar.xml
|
| +++ b/remoting/android/java/res/menu/desktop_actionbar.xml
|
| @@ -6,26 +6,31 @@
|
| -->
|
|
|
| <!--Action bar buttons for the Android app's remote desktop viewer-->
|
| -<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
| +<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
| + xmlns:app="http://schemas.android.com/apk/res-auto">
|
| + <item android:id="@+id/media_route_menu_item"
|
| + android:title="@string/media_route_menu_title"
|
| + app:actionProviderClass="android.support.v7.app.MediaRouteActionProvider"
|
| + app:showAsAction="always"/>
|
| <item android:id="@+id/actionbar_keyboard"
|
| android:title="@string/show_hide_keyboard"
|
| android:icon="@drawable/ic_action_keyboard"
|
| - android:showAsAction="ifRoom"/>
|
| + app:showAsAction="ifRoom"/>
|
| <item android:id="@+id/actionbar_hide"
|
| android:title="@string/full_screen"
|
| android:icon="@drawable/ic_action_full_screen"
|
| - android:showAsAction="ifRoom"/>
|
| + app:showAsAction="ifRoom"/>
|
| <item android:id="@+id/actionbar_send_ctrl_alt_del"
|
| android:title="@string/send_ctrl_alt_del"
|
| - android:showAsAction="withText"/>
|
| + app:showAsAction="withText"/>
|
| <item android:id="@+id/actionbar_disconnect"
|
| android:title="@string/disconnect_myself_button"
|
| - android:showAsAction="withText"/>
|
| + app:showAsAction="withText"/>
|
| <!--
|
| The Help option must be the final menu item and it must only appear in
|
| the action-bar overflow menu.
|
| -->
|
| <item android:id="@+id/actionbar_help"
|
| android:title="@string/actionbar_help"
|
| - android:showAsAction="never"/>
|
| + app:showAsAction="never"/>
|
| </menu>
|
|
|