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

Commit 6d836d2d authored by Wesley.CW Wang's avatar Wesley.CW Wang Committed by Wesley Wang
Browse files

Update low battery tips string 

 - Screenshot: https://screenshot.googleplex.com/33zJkqsTex8r49W.png

Bug: 183689347
Test: make RunSettingsRoboTests
Change-Id: I864c555c3e500bf4ae5364db8dd6c86be564b883
parent cf2dc510

src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java

+1 −2
Original line number Diff line number Diff line
@@ -89,8 +89,7 @@ public class BatteryTipLoader extends AsyncLoaderCompat<List<BatteryTip>> { 
        final List<BatteryTip> tips = new ArrayList<>();

        tips.add(new SummaryTip(BatteryTip.StateType.NEW,

                EstimateKt.AVERAGE_TIME_TO_DISCHARGE_UNKNOWN));

        tips.add(new LowBatteryTip(BatteryTip.StateType.NEW, false /* powerSaveModeOn */,

                "Fake data"));

        tips.add(new LowBatteryTip(BatteryTip.StateType.NEW, false /* powerSaveModeOn */));



        return tips;

    }

src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetector.java

+1 −2
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ public class LowBatteryDetector implements BatteryTipDetector { 
            state = BatteryTip.StateType.NEW;

        }



        return new LowBatteryTip(

                state, powerSaveModeOn, mBatteryInfo.suggestionLabel);

        return new LowBatteryTip(state, powerSaveModeOn);

    }

}

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

+8 −6
Original line number Diff line number Diff line
@@ -21,34 +21,36 @@ import android.content.Context; 
import android.os.Parcel;

import android.os.Parcelable;



import com.android.settings.R;

import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;



/**

 * Tip to show current battery level is low or remaining time is less than a certain period

 */

public class LowBatteryTip extends EarlyWarningTip {

    private CharSequence mSummary;



    public LowBatteryTip(@StateType int state, boolean powerSaveModeOn, CharSequence summary) {

    public LowBatteryTip(@StateType int state, boolean powerSaveModeOn) {

        super(state, powerSaveModeOn);

        mType = TipType.LOW_BATTERY;

        mSummary = summary;

    }



    public LowBatteryTip(Parcel in) {

        super(in);

        mSummary = in.readCharSequence();

    }



    @Override

    public CharSequence getTitle(Context context) {

        return context.getString(R.string.battery_tip_low_battery_title);

    }



    @Override

    public CharSequence getSummary(Context context) {

        return mSummary;

        return context.getString(R.string.battery_tip_low_battery_summary);

    }



    @Override

    public void writeToParcel(Parcel dest, int flags) {

        super.writeToParcel(dest, flags);

        dest.writeCharSequence(mSummary);

    }



    @Override

tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java

+1 −2
Original line number Diff line number Diff line
@@ -67,8 +67,7 @@ public class BatteryTipUtilsTest { 
        mEarlyWarningTip = spy(

                new EarlyWarningTip(BatteryTip.StateType.NEW, true /* powerSaveModeOn */));

        mLowBatteryTip = spy(

                new LowBatteryTip(BatteryTip.StateType.NEW, false /* powerSaveModeOn */,

                        "" /* summary */));

                new LowBatteryTip(BatteryTip.StateType.NEW, false /* powerSaveModeOn */));

        mBatteryDefenderTip = spy(new BatteryDefenderTip(BatteryTip.StateType.NEW));

    }

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

+9 −3
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import org.robolectric.RuntimeEnvironment; 
@RunWith(RobolectricTestRunner.class)

public class LowBatteryTipTest {



    private static final CharSequence SUMMARY = "Only 15 minutes left";

    private static final CharSequence SUMMARY = "Turn on Battery Saver to extend battery life";



    @Mock

    private MetricsFeatureProvider mMetricsFeatureProvider;
@@ -48,8 +48,7 @@ public class LowBatteryTipTest { 
        MockitoAnnotations.initMocks(this);



        mContext = RuntimeEnvironment.application;

        mLowBatteryTip = new LowBatteryTip(BatteryTip.StateType.NEW, false /* powerSaveModeOn */,

                SUMMARY);

        mLowBatteryTip = new LowBatteryTip(BatteryTip.StateType.NEW, false /* powerSaveModeOn */);

    }



    @Test
@@ -64,6 +63,13 @@ public class LowBatteryTipTest { 
        assertThat(parcelTip.getSummary(mContext)).isEqualTo(SUMMARY);

    }



    @Test

    public void getSummary_tipNew_showTitle() {

        mLowBatteryTip.mState = BatteryTip.StateType.NEW;



        assertThat(mLowBatteryTip.getTitle(mContext)).isEqualTo("Battery level low");

    }



    @Test

    public void getSummary_tipNew_showSummary() {

        mLowBatteryTip.mState = BatteryTip.StateType.NEW;