Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dc15da1 authored by Lei Yu's avatar Lei Yu Committed by android-build-merger
Browse files

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

am: ae099756

Change-Id: I04595941491f6d2747cbf7c6db03afad166fb6df
parents 4e24b3ff ae099756

res/values/strings.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -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>









































src/com/android/settings/fuelgauge/SmartBatterySettings.java



+5
−0




























Original line number
Original line
Diff line number
Diff line








@@ -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);