summaryrefslogtreecommitdiffstats
path: root/remoting/resources
diff options
context:
space:
mode:
authorlambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-27 00:29:08 +0000
committerlambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-27 00:29:08 +0000
commitbdc71c62e71e7d79ec7560c02dd5edbb23be64fd (patch)
tree4919e2867087ab6188c8c6b5518c4b9c449fc56e /remoting/resources
parent1215b5c1868f25ea1b69075fdc9f6d7788c82e1f (diff)
downloadchromium_src-bdc71c62e71e7d79ec7560c02dd5edbb23be64fd.zip
chromium_src-bdc71c62e71e7d79ec7560c02dd5edbb23be64fd.tar.gz
chromium_src-bdc71c62e71e7d79ec7560c02dd5edbb23be64fd.tar.bz2
Add Help & feedback screens to Android Chromoting client
This adds a Help & feedback menu-item for each screen of the app. The Help screen embeds a WebView, which shows a URL dependent on which screen the Help was launched from. There is also a Feedback menu-item, which is currently hidden, pending implementation of this feature (only the Official build will have it). A menu-item is provided for showing the Play Store entry for the application. More menu-items can be added (such as Copyright, Privacy policy, Open source licences) if they are required in the app. BUG=333129 NOTRY=true Review URL: https://codereview.chromium.org/179003006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253659 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/resources')
-rw-r--r--remoting/resources/android/menu/help_actionbar.xml16
-rw-r--r--remoting/resources/remoting_strings.grd11
2 files changed, 26 insertions, 1 deletions
diff --git a/remoting/resources/android/menu/help_actionbar.xml b/remoting/resources/android/menu/help_actionbar.xml
new file mode 100644
index 0000000..934f095
--- /dev/null
+++ b/remoting/resources/android/menu/help_actionbar.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright 2014 The Chromium Authors. All rights reserved.
+ Use of this source code is governed by a BSD-style license that can be
+ found in the LICENSE file.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:id="@+id/actionbar_feedback"
+ android:title="@string/actionbar_feedback"
+ android:showAsAction="ifRoom|withText"
+ android:visible="false"/>
+ <item android:id="@+id/actionbar_play_store"
+ android:title="@string/actionbar_play_store"
+ android:showAsAction="never"/>
+</menu>
diff --git a/remoting/resources/remoting_strings.grd b/remoting/resources/remoting_strings.grd
index 48cd896..9b1bc3d 100644
--- a/remoting/resources/remoting_strings.grd
+++ b/remoting/resources/remoting_strings.grd
@@ -378,9 +378,18 @@
</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">
+ <message desc="Title displayed in the action-bar for the Android Help screen" name="IDS_ACTIONBAR_HELP_TITLE" formatter_data="android_java">
+ Help
+ </message>
+ <message desc="Android action-bar menu item for showing the Help and Feedback screen" name="IDS_ACTIONBAR_HELP" formatter_data="android_java">
Help &amp; feedback
</message>
+ <message desc="Label for the Feedback button displayed in the Android Help screen. Pressing this button causes the Feedback screen to be shown." name="IDS_ACTIONBAR_FEEDBACK" formatter_data="android_java">
+ Feedback
+ </message>
+ <message desc="Android action-bar menu item for viewing the Play Store page for the application" name="IDS_ACTIONBAR_PLAY_STORE" formatter_data="android_java">
+ View in Google Play Store
+ </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">