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

Merge "Add help uri for smart battery page" into pi-dev am: 64135745b9

Browse Source 
am: ae09975605

Change-Id: I04595941491f6d2747cbf7c6db03afad166fb6df
This commit is contained in:
Lei Yu
2018-05-10 18:14:00 -07:00
committed by android-build-merger
parent 4e24b3ffde ae09975605
commit 8dc15da1e0
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -9811,6 +9811,9 @@
<!-- Help URI, battery saver page [DO NOT TRANSLATE] --> <!-- Help URI, battery saver page [DO NOT TRANSLATE] -->
<string name="help_url_battery_saver_settings" translatable="false"></string> <string name="help_url_battery_saver_settings" translatable="false"></string>
<!-- Help URI, smart battery page [DO NOT TRANSLATE] -->
<string name="help_uri_smart_battery_settings" translatable="false"></string>
<!-- Title label for new device suggestion, which is displayed in Settings homepage [CHAR LIMIT=100] --> <!-- Title label for new device suggestion, which is displayed in Settings homepage [CHAR LIMIT=100] -->
<string name="new_device_suggestion_title">What\'s new and exciting?</string> <string name="new_device_suggestion_title">What\'s new and exciting?</string>

5
src/com/android/settings/fuelgauge/SmartBatterySettings.java
View File

@@ -61,6 +61,11 @@ public class SmartBatterySettings extends DashboardFragment {
return R.xml.smart_battery_detail; return R.xml.smart_battery_detail;
} }
@Override
public int getHelpResource() {
return R.string.help_uri_smart_battery_settings;
}
@Override @Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, (SettingsActivity) getActivity(), this); return buildPreferenceControllers(context, (SettingsActivity) getActivity(), this);