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

Commit b70b4780 authored by YK Hung's avatar YK Hung Committed by Android (Google) Code Review
Browse files

Merge "[Expressive Battery] Initializes message preference when tip type change" into main

parents 2b72e413 c5c84f5b

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

+5 −0
Original line number Diff line number Diff line
@@ -170,7 +170,12 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable { 
        final BannerMessagePreference cardPreference =

                castToBannerMassagePreferenceSafely(preference);

        if (cardPreference != null) {

            // Initializes message preference when tip type change

            cardPreference.setAttentionLevel(AttentionLevel.NORMAL);

            cardPreference.setDismissButtonVisible(false);

            cardPreference.setPositiveButtonVisible(false);

            cardPreference.setNegativeButtonVisible(false);

            cardPreference.setOnPreferenceClickListener(null);

        }

    }

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

+3 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat; 


import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;
@@ -151,7 +152,8 @@ public class BatteryDefenderTipTest { 
    public void updatePreference_whenNotCharging_SetPositiveButtonVisibleToBeFalse() {

        mBatteryDefenderTip.updatePreference(mCardPreference);



        verify(mCardPreference).setPositiveButtonVisible(false);

        // Once for init, once for update

        verify(mCardPreference, times(2)).setPositiveButtonVisible(false);

    }



    private String getLastErrorLog() {