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

Commit 80a5336b authored by Andrew Sapperstein's avatar Andrew Sapperstein Committed by android-build-merger
Browse files

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

am: 59a66d9b

Change-Id: I7513463a50ddef4f49d8d7ab06ed8fd9e19d3a52
parents ef0e290e 59a66d9b

res/values/strings.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -6249,6 +6249,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>
































src/com/android/settings/applications/ProcessStatsSummary.java



+5
−0






























Original line number
Original line
Diff line number
Diff line







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
































src/com/android/settings/applications/ProcessStatsUi.java



+5
−0






























Original line number
Original line
Diff line number
Diff line







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