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

Commit 320ad125 authored by Wesley Wang's avatar Wesley Wang Committed by Automerger Merge Worker
Browse files

Merge "Update extra defend layout string" into tm-qpr-dev am: a0c76c92 am: 20e92716 

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



Change-Id: I288c58df33642427aa8b39f3d1af6f4cb521c8d1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2d3d452f 20e92716

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

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ public class BatteryDefenderTip extends BatteryTip { 
                });

        cardPreference.setPrimaryButtonVisible(isPluggedIn(context));



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

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

        cardPreference.setSecondaryButtonClickListener(unused -> cardPreference.performClick());

        cardPreference.setSecondaryButtonVisible(true);

    }

tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTipTest.java

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ public class BatteryDefenderTipTest { 


    @Test

    public void updatePreference_shouldSetSecondaryButtonText() {

        String expected = mContext.getString(R.string.see_more);

        String expected = mContext.getString(R.string.learn_more);



        mBatteryDefenderTip.updatePreference(mCardPreference);