Merge \"Add help url for gestures settings.\" into nyc-mr1-dev

am: 0a7300b8d1

Change-Id: Ia267524166ed0c9ffb3f517a0c81119d45e7a57b
This commit is contained in:
Doris Ling
2016-06-30 20:06:00 +00:00
committed by android-build-merger
2 changed files with 7 additions and 0 deletions

View File

@@ -5621,6 +5621,8 @@
<string name="help_url_remote_display" translatable="false"></string>
<!-- Help URL, Fingerprint [DO NOT TRANSLATE] -->
<string name="help_url_fingerprint" translatable="false"></string>
<!-- Help URL, Gesture settings -->
<string name="help_url_gestures" translatable="false"></string>
<!-- User account title [CHAR LIMIT=30] -->
<string name="user_account_title">Account for content</string>

View File

@@ -109,6 +109,11 @@ public class GestureSettings extends SettingsPreferenceFragment implements
return true;
}
@Override
protected int getHelpResource() {
return R.string.help_url_gestures;
}
@Override
protected int getMetricsCategory() {
return MetricsEvent.SETTINGS_GESTURES;