diff options
| author | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-21 23:26:20 +0000 |
|---|---|---|
| committer | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-21 23:26:20 +0000 |
| commit | e908b234787a8f216ca36ac0f531a1cde04e3152 (patch) | |
| tree | e0777c08f4de38f5c9b3392b482895301fcc3c3b /remoting/resources | |
| parent | 2308fc3757835099b363c252cad1a4de6f83c63a (diff) | |
| download | chromium_src-e908b234787a8f216ca36ac0f531a1cde04e3152.zip chromium_src-e908b234787a8f216ca36ac0f531a1cde04e3152.tar.gz chromium_src-e908b234787a8f216ca36ac0f531a1cde04e3152.tar.bz2 | |
Add strings and placeholder menu items for Android Chromoting help
This updates the verify_resources.py tool to exempt Android strings
from the "resource in use" check.
BUG=333129,270362
Review URL: https://codereview.chromium.org/168283008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252684 0039d316-1c4b-4281-b951-d872f2087c98
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> |