PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add help uri for process stats summary and apps." into oc-dr1-dev am: 59a66d9b77

Browse Source 
am: ebd8308698

Change-Id: I5bcbe810c82c2a71a8cd8ff8f9ab5a6f4a6015e7
This commit is contained in:
Andrew Sapperstein
2017-07-22 00:37:40 +00:00
committed by android-build-merger
parent fab6b8cd4d ebd8308698
commit 012244e52d
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -6264,6 +6264,8 @@
<string name="help_url_double_tap_screen" translatable="false"></string> <string name="help_url_double_tap_screen" translatable="false"></string>
<string name="help_url_account_detail" translatable="false"></string> <string name="help_url_account_detail" translatable="false"></string>
<string name="help_url_icc_lock" translatable="false"></string> <string name="help_url_icc_lock" translatable="false"></string>
<string name="help_uri_process_stats_summary" translatable="false"></string>
<string name="help_uri_process_stats_apps" translatable="false"></string>
<!-- User account title [CHAR LIMIT=30] --> <!-- User account title [CHAR LIMIT=30] -->
<string name="user_account_title">Account for content</string> <string name="user_account_title">Account for content</string>

5
src/com/android/settings/applications/ProcessStatsSummary.java
View File

@@ -102,6 +102,11 @@ public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenc
return MetricsEvent.PROCESS_STATS_SUMMARY; return MetricsEvent.PROCESS_STATS_SUMMARY;
} }
@Override
protected int getHelpResource() {
return R.string.help_uri_process_stats_summary;
}
@Override @Override
public boolean onPreferenceClick(Preference preference) { public boolean onPreferenceClick(Preference preference) {
if (preference == mAppListPreference) { if (preference == mAppListPreference) {

5
src/com/android/settings/applications/ProcessStatsUi.java
View File

@@ -95,6 +95,11 @@ public class ProcessStatsUi extends ProcessStatsBase {
return MetricsEvent.APPLICATIONS_PROCESS_STATS_UI; return MetricsEvent.APPLICATIONS_PROCESS_STATS_UI;
} }
@Override
protected int getHelpResource() {
return R.string.help_uri_process_stats_apps;
}
@Override @Override
public void onSaveInstanceState(Bundle outState) { public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);