diff options
Diffstat (limited to 'remoting/resources')
| -rw-r--r-- | remoting/resources/android/menu/chromoting_actionbar.xml | 7 | ||||
| -rw-r--r-- | remoting/resources/android/menu/desktop_actionbar.xml | 7 | ||||
| -rw-r--r-- | remoting/resources/remoting_strings.grd | 6 |
3 files changed, 20 insertions, 0 deletions
diff --git a/remoting/resources/android/menu/chromoting_actionbar.xml b/remoting/resources/android/menu/chromoting_actionbar.xml index 6f057d0..6831eb4 100644 --- a/remoting/resources/android/menu/chromoting_actionbar.xml +++ b/remoting/resources/android/menu/chromoting_actionbar.xml @@ -11,4 +11,11 @@ android:title="@string/actionbar_directoryrefresh" android:icon="@android:drawable/ic_popup_sync" android:showAsAction="ifRoom"/> + <!-- + 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"/> </menu> diff --git a/remoting/resources/android/menu/desktop_actionbar.xml b/remoting/resources/android/menu/desktop_actionbar.xml index 05f97ef..e67615e 100644 --- a/remoting/resources/android/menu/desktop_actionbar.xml +++ b/remoting/resources/android/menu/desktop_actionbar.xml @@ -21,4 +21,11 @@ <item android:id="@+id/actionbar_disconnect" android:title="@string/actionbar_disconnect" android: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"/> </menu> diff --git a/remoting/resources/remoting_strings.grd b/remoting/resources/remoting_strings.grd index 47ba473..48cd896 100644 --- a/remoting/resources/remoting_strings.grd +++ b/remoting/resources/remoting_strings.grd @@ -377,6 +377,12 @@ </message> </if> + <if expr="is_android"> + <message desc="Text displayed in the Android action-bar overflow menu for showing the Help and Feedback screen" name="IDS_ACTIONBAR_HELP" formatter_data="android_java"> + Help & feedback + </message> + </if> + <message desc="Label for the access code entry box. This is where the client user enters the code that permits access to the host." name="IDS_ACCESS_CODE"> Access code </message> |