commit 169e8a0c2aee26731a847a46954d95a78161ecd8
author Jeff Brown <jeffbrown@google.com> Mon Nov 18 19:09:55 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 18 19:09:55 2013 -0800
tree 6deeb52821e730cfc029e23963c17298801018cf
parent f9ca318a3d2aceaf5c9e54610073a9017442be9b
parent 017d2a189ac758ad035182a886c4f4e578cee6f2

am 017d2a18: am 130118d4: Add help url for remote display.

* commit '017d2a189ac758ad035182a886c4f4e578cee6f2':
  Add help url for remote display.

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 586373c..db8b4b7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4845,6 +4845,8 @@
     <string name="help_url_security" translatable="false"></string>
     <!-- Help URL, Tap & pay [DO NOT TRANSLATE] -->
     <string name="help_url_nfc_payment" translatable="false"></string>
+    <!-- Help URL, Remote display [DO NOT TRANSLATE] -->
+    <string name="help_url_remote_display" translatable="false"></string>
 
     <!-- User account title [CHAR LIMIT=30] -->
     <string name="user_account_title">Account for content</string>

src/com/android/settings/wfd/WifiDisplaySettings.java

diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java
index d04f6f2..d7f4708 100755
--- a/src/com/android/settings/wfd/WifiDisplaySettings.java
+++ b/src/com/android/settings/wfd/WifiDisplaySettings.java
@@ -137,6 +137,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_remote_display;
+    }
+
+    @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);