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

Commit e7ec6ee0 authored by YK Hung's avatar YK Hung Committed by Automerger Merge Worker
Browse files

Merge "Update dock defender helper URL" into tm-qpr-dev am: c89f78c6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20742827



Change-Id: I7d3f436b5e7da6c380402014813d0233c55b0b06
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf8ab7ee c89f78c6

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -8147,6 +8147,8 @@ 
    <string name="help_url_battery" translatable="false"></string>

    <!-- Help URL, Battery Defender [DO NOT TRANSLATE] -->

    <string name="help_url_battery_defender" translatable="false"></string>

    <!-- Help URL, Dock Defender [DO NOT TRANSLATE] -->

    <string name="help_url_dock_defender" translatable="false"></string>

    <!-- Help URL, Accounts [DO NOT TRANSLATE] -->

    <string name="help_url_accounts" translatable="false"></string>

    <!-- Help URL, Choose lockscreen [DO NOT TRANSLATE] -->

src/com/android/settings/fuelgauge/batterytip/tips/DockDefenderTip.java

+1 −2
Original line number Diff line number Diff line
@@ -139,12 +139,11 @@ public class DockDefenderTip extends BatteryTip { 
        }



        cardPreference.setSecondaryButtonText(context.getString(R.string.learn_more));

        //TODO: update helper string

        cardPreference.setSecondaryButtonClickListener(

                button -> button.startActivityForResult(

                        HelpUtils.getHelpIntent(

                                context,

                                context.getString(R.string.help_url_battery_defender),

                                context.getString(R.string.help_url_dock_defender),

                                /* backupContext */ ""), /* requestCode */ 0));

        cardPreference.setSecondaryButtonVisible(true);

        cardPreference.setSecondaryButtonContentDescription(context.getString(