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

Commit 80fd7468 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update battery discharging strings"

parents 19130fea eec87364

packages/SettingsLib/res/values/strings.xml

+44 −38
Original line number Diff line number Diff line
@@ -878,45 +878,51 @@ 


    <!-- [CHAR_LIMIT=40] Label for estimated remaining duration of battery discharging -->

    <string name="power_remaining_duration_only">About <xliff:g id="time">%1$s</xliff:g> left</string>

    <!-- [CHAR_LIMIT=40] Label for battery level chart when discharging with duration -->

    <string name="power_discharging_duration">About <xliff:g id="time">%1$s</xliff:g> left (<xliff:g id="level">%2$s</xliff:g>)</string>

    <!-- [CHAR_LIMIT=60] Label for estimated remaining duration of battery discharging -->

    <string name="power_remaining_duration_only_enhanced">About <xliff:g id="time">%1$s</xliff:g> left based on your usage</string>

  <!-- [CHAR_LIMIT=40] Label for estimated remaining duration of battery charging -->

  <string name="power_remaining_charging_duration_only"><xliff:g id="time">%1$s</xliff:g> left until fully charged</string>



    <!-- [CHAR_LIMIT=60] Label for battery level chart when discharging with duration and using enhanced estimate -->

    <string name="power_discharging_duration_enhanced">About <xliff:g id="time">%1$s</xliff:g> left based on your usage (<xliff:g id="level">%2$s</xliff:g>)</string>

    <!-- [CHAR_LIMIT=40] Short label for estimated remaining duration of battery charging/discharging -->

    <string name="power_remaining_duration_only_short"><xliff:g id="time">%1$s</xliff:g> left</string>



    <!-- [CHAR_LIMIT=100] Label for enhanced estimated time that phone will run out of battery -->

    <string name="power_discharge_by_enhanced">Will last until about about <xliff:g id="time">%1$s</xliff:g> based on your usage (<xliff:g id="level">%2$s</xliff:g>)</string>

    <!-- [CHAR_LIMIT=100] Label for enhanced estimated time that phone will run out of battery with no percentage -->

    <string name="power_discharge_by_only_enhanced">Will last until about about <xliff:g id="time">%1$s</xliff:g> based on your usage</string>

    <!-- [CHAR_LIMIT=100] Label for estimated time that phone will run out of battery -->

    <string name="power_discharge_by">Will last until about about <xliff:g id="time">%1$s</xliff:g> (<xliff:g id="level">%2$s</xliff:g>)</string>

    <!-- [CHAR_LIMIT=100] Label for estimated time that phone will run out of battery -->

    <string name="power_discharge_by_only">Will last until about about <xliff:g id="time">%1$s</xliff:g></string>



    <!-- [CHAR_LIMIT=60] label for estimated remaining duration of battery when under a certain amount -->

    <string name="power_remaining_less_than_duration_only">Less than <xliff:g id="threshold">%1$s</xliff:g> remaining</string>

    <!-- [CHAR_LIMIT=60] label for estimated remaining duration of battery when under a certain amount with the percentage -->

  <string name="power_remaining_less_than_duration"><xliff:g id="level">%1$s</xliff:g> - Less than <xliff:g id="threshold">%2$s</xliff:g> remaining</string>

    <string name="power_remaining_less_than_duration">Less than <xliff:g id="threshold">%1$s</xliff:g> remaining (<xliff:g id="level">%2$s</xliff:g>)</string>



    <!-- Used to let users know that they have more than some amount of battery life remaining with percentage. ex: 75% - more than 1 day remaining [CHAR LIMIT = 80] -->

  <string name="power_remaining_more_than_subtext"><xliff:g id="level">%1$s</xliff:g>more than <xliff:g id="time_remaining">%2$s</xliff:g> remaining</string>

    <string name="power_remaining_more_than_subtext">More than <xliff:g id="time_remaining">%1$s</xliff:g> remaining (<xliff:g id="level">%2$s</xliff:g>)</string>

    <!-- Used to let users know that they have more than some amount of battery life remaining. ex: more than 1 day remaining [CHAR LIMIT = 40] -->

  <string name="power_remaining_only_more_than_subtext">more than <xliff:g id="time_remaining">%1$s</xliff:g> remaining</string>

    <string name="power_remaining_only_more_than_subtext">More than <xliff:g id="time_remaining">%1$s</xliff:g> remaining</string>



    <!-- [CHAR_LIMIT=50] Short label for imminent shutdown warning of device -->

  <string name="power_remaining_duration_only_shutdown_imminent" product="default">phone may shutdown soon</string>

    <string name="power_remaining_duration_only_shutdown_imminent" product="default">Phone may shutdown soon</string>

    <!-- [CHAR_LIMIT=50] Short label for imminent shutdown warning of device -->

  <string name="power_remaining_duration_only_shutdown_imminent" product="tablet">tablet may shutdown soon</string>

    <string name="power_remaining_duration_only_shutdown_imminent" product="tablet">Tablet may shutdown soon</string>

    <!-- [CHAR_LIMIT=50] Short label for imminent shutdown warning of device -->

  <string name="power_remaining_duration_only_shutdown_imminent" product="device">device may shutdown soon</string>



  <!-- [CHAR_LIMIT=40] Label for battery level chart when discharging with duration -->

  <string name="power_discharging_duration"><xliff:g id="level">%1$s</xliff:g> - about <xliff:g id="time">%2$s</xliff:g> left</string>

  <!-- [CHAR_LIMIT=60] Label for battery level chart when discharging with duration and using enhanced estimate -->

  <string name="power_discharging_duration_enhanced"><xliff:g id="level">%1$s</xliff:g> - about <xliff:g id="time">%2$s</xliff:g> left based on your usage</string>



    <string name="power_remaining_duration_only_shutdown_imminent" product="device">Device may shutdown soon</string>

    <!-- [CHAR_LIMIT=60] Label for battery level chart when shutdown is imminent-->

  <string name="power_remaining_duration_shutdown_imminent" product="default"><xliff:g id="level">%1$s</xliff:g> - phone may shutdown soon</string>

    <string name="power_remaining_duration_shutdown_imminent" product="default">Phone may shutdown soon (<xliff:g id="level">%1$s</xliff:g>)</string>

    <!-- [CHAR_LIMIT=60] Label for battery level chart when shutdown is imminent-->

  <string name="power_remaining_duration_shutdown_imminent" product="tablet"><xliff:g id="level">%1$s</xliff:g> - tablet may shutdown soon</string>

    <string name="power_remaining_duration_shutdown_imminent" product="tablet">Tablet may shutdown soon (<xliff:g id="level">%1$s</xliff:g>)</string>

    <!-- [CHAR_LIMIT=60] Label for battery level chart when shutdown is imminent-->

  <string name="power_remaining_duration_shutdown_imminent" product="device"><xliff:g id="level">%1$s</xliff:g> - device may shutdown soon</string>

    <string name="power_remaining_duration_shutdown_imminent" product="device">Device may shutdown soon (<xliff:g id="level">%1$s</xliff:g>)</string>



    <!-- [CHAR_LIMIT=40] Label for battery level chart when charging -->

    <string name="power_charging"><xliff:g id="level">%1$s</xliff:g> - <xliff:g id="state">%2$s</xliff:g></string>

    <!-- [CHAR_LIMIT=40] Label for estimated remaining duration of battery charging -->

    <string name="power_remaining_charging_duration_only"><xliff:g id="time">%1$s</xliff:g> left until fully charged</string>

    <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->

    <string name="power_charging_duration"><xliff:g id="level">%1$s</xliff:g> - <xliff:g id="time">%2$s</xliff:g> until fully charged</string>

packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java

+58 −21
Original line number Diff line number Diff line
@@ -17,22 +17,30 @@ 
package com.android.settingslib.utils;



import android.content.Context;

import android.icu.text.DateFormat;

import android.icu.text.MeasureFormat;

import android.icu.text.MeasureFormat.FormatWidth;

import android.icu.util.Measure;

import android.icu.util.MeasureUnit;

import android.support.annotation.Nullable;

import android.text.TextUtils;

import com.android.internal.annotations.VisibleForTesting;

import com.android.settingslib.R;

import com.android.settingslib.utils.StringUtil;

import java.time.Clock;

import java.time.Instant;

import java.util.Calendar;

import java.util.Date;

import java.util.Locale;

import java.util.concurrent.TimeUnit;



/** Utility class for keeping power related strings consistent**/

public class PowerUtil {



    private static final long SEVEN_MINUTES_MILLIS = TimeUnit.MINUTES.toMillis(7);

    private static final long FIFTEEN_MINUTES_MILLIS = TimeUnit.MINUTES.toMillis(15);

    private static final long ONE_DAY_MILLIS = TimeUnit.DAYS.toMillis(1);

    private static final long TWO_DAYS_MILLIS = TimeUnit.DAYS.toMillis(2);

    private static final long ONE_HOUR_MILLIS = TimeUnit.HOURS.toMillis(1);



    /**

     * This method produces the text used in various places throughout the system to describe the
@@ -57,11 +65,15 @@ public class PowerUtil { 
                        FIFTEEN_MINUTES_MILLIS,

                        false /* withSeconds */);

                return getUnderFifteenString(context, timeString, percentageString);

            } else if (drainTimeMs >= TWO_DAYS_MILLIS) {

                // just say more than two day if over 48 hours

                return getMoreThanTwoDaysString(context, percentageString);

            } else if (drainTimeMs >= ONE_DAY_MILLIS) {

                // just say more than one day if over 24 hours

                return getMoreThanOneDayString(context, percentageString);

                // show remaining days & hours if more than a day

                return getMoreThanOneDayString(context, drainTimeMs,

                        percentageString, basedOnUsage);

            } else {

                // show a regular time remaining string

                // show the time of day we think you'll run out

                return getRegularTimeRemainingString(context, drainTimeMs,

                        percentageString, basedOnUsage);

            }
@@ -83,44 +95,69 @@ public class PowerUtil { 
                ? context.getString(R.string.power_remaining_less_than_duration_only, timeString)

                : context.getString(

                        R.string.power_remaining_less_than_duration,

                        percentageString,

                        timeString);

                        timeString,

                        percentageString);



    }



    private static String getMoreThanOneDayString(Context context, long drainTimeMs,

            String percentageString, boolean basedOnUsage) {

        final long roundedTimeMs = roundToNearestThreshold(drainTimeMs, ONE_HOUR_MILLIS);

        CharSequence timeString = StringUtil.formatElapsedTime(context,

                roundedTimeMs,

                false /* withSeconds */);



        if (TextUtils.isEmpty(percentageString)) {

            int id = basedOnUsage

                    ? R.string.power_remaining_duration_only_enhanced

                    : R.string.power_remaining_duration_only;

            return context.getString(id, timeString);

        } else {

            int id = basedOnUsage

                    ? R.string.power_discharging_duration_enhanced

                    : R.string.power_discharging_duration;

            return context.getString(id, timeString, percentageString);

        }

    }



    private static String getMoreThanOneDayString(Context context, String percentageString) {

    private static String getMoreThanTwoDaysString(Context context, String percentageString) {

        final Locale currentLocale = context.getResources().getConfiguration().getLocales().get(0);

        final MeasureFormat frmt = MeasureFormat.getInstance(currentLocale, FormatWidth.SHORT);



        final Measure daysMeasure = new Measure(1, MeasureUnit.DAY);

        final Measure daysMeasure = new Measure(2, MeasureUnit.DAY);



        return TextUtils.isEmpty(percentageString)

                ? context.getString(R.string.power_remaining_only_more_than_subtext,

                        frmt.formatMeasures(daysMeasure))

                : context.getString(

                        R.string.power_remaining_more_than_subtext,

                        percentageString,

                        frmt.formatMeasures(daysMeasure));

                        frmt.formatMeasures(daysMeasure),

                        percentageString);

    }



    private static String getRegularTimeRemainingString(Context context, long drainTimeMs,

            String percentageString, boolean basedOnUsage) {

        // round to the nearest 15 min to not appear oversly precise

        final long roundedTimeMs = roundToNearestThreshold(drainTimeMs,

        // Get the time of day we think device will die rounded to the nearest 15 min.

        final long roundedTimeOfDayMs =

                roundToNearestThreshold(

                        System.currentTimeMillis() + drainTimeMs,

                        FIFTEEN_MINUTES_MILLIS);

        CharSequence timeString = StringUtil.formatElapsedTime(context,

                roundedTimeMs,

                false /* withSeconds */);



        // convert the time to a properly formatted string.

        DateFormat fmt = DateFormat.getTimeInstance(DateFormat.SHORT);

        Date date = Date.from(Instant.ofEpochMilli(roundedTimeOfDayMs));

        CharSequence timeString = fmt.format(date);



        if (TextUtils.isEmpty(percentageString)) {

            int id = basedOnUsage

                    ? R.string.power_remaining_duration_only_enhanced

                    : R.string.power_remaining_duration_only;

                    ? R.string.power_discharge_by_only_enhanced

                    : R.string.power_discharge_by_only;

            return context.getString(id, timeString);

        } else {

            int id = basedOnUsage

                    ? R.string.power_discharging_duration_enhanced

                    : R.string.power_discharging_duration;

            return context.getString(id, percentageString, timeString);

                    ? R.string.power_discharge_by_enhanced

                    : R.string.power_discharge_by;

            return context.getString(id, timeString, percentageString);

        }

    }

packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java

+51 −39
Original line number Diff line number Diff line
@@ -24,13 +24,18 @@ import android.content.Context; 
import com.android.settingslib.R;

import com.android.settingslib.SettingsLibRobolectricTestRunner;



import java.time.Clock;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RuntimeEnvironment;



import java.time.Duration;

import org.robolectric.annotation.Config;

import org.robolectric.shadows.ShadowSettings.ShadowSystem;

import org.robolectric.shadows.ShadowSystemClock;



@RunWith(SettingsLibRobolectricTestRunner.class)

public class PowerUtilTest {
@@ -39,8 +44,12 @@ public class PowerUtilTest { 
    public static final long SEVENTEEN_MIN_MILLIS = Duration.ofMinutes(17).toMillis();

    public static final long FIVE_MINUTES_MILLIS = Duration.ofMinutes(5).toMillis();

    public static final long TEN_MINUTES_MILLIS = Duration.ofMinutes(10).toMillis();

    public static final long TWO_DAYS_MILLIS = Duration.ofDays(2).toMillis();

    public static final String ONE_DAY_FORMATTED = "1 day";

    public static final long THREE_DAYS_MILLIS = Duration.ofDays(3).toMillis();

    public static final long THIRTY_HOURS_MILLIS = Duration.ofHours(30).toMillis();

    public static final String TWO_DAYS_FORMATTED = "2 days";

    public static final String THIRTY_HOURS_FORMATTED = "1d 6h";

    public static final String NORMAL_CASE_EXPECTED_PREFIX = "Will last until about";

    public static final String ENHANCED_SUFFIX = "based on your usage";



    private Context mContext;
@@ -51,6 +60,7 @@ public class PowerUtilTest { 
    }



    @Test

    @Config(shadows = {ShadowSystemClock.class})

    public void testGetBatteryRemainingStringFormatted_moreThanFifteenMinutes_withPercentage() {

        String info = PowerUtil.getBatteryRemainingStringFormatted(mContext,

                SEVENTEEN_MIN_MILLIS,
@@ -62,15 +72,13 @@ public class PowerUtilTest { 
                false /* basedOnUsage */);



        // We only add special mention for the long string

        assertThat(info).isEqualTo(mContext.getString(

                R.string.power_discharging_duration_enhanced,

                TEST_BATTERY_LEVEL_10,

                FIFTEEN_MIN_FORMATTED));

        assertThat(info).contains(NORMAL_CASE_EXPECTED_PREFIX);

        assertThat(info).contains(ENHANCED_SUFFIX);

        assertThat(info).contains("%");

        // shortened string should not have extra text

        assertThat(info2).isEqualTo(mContext.getString(

                R.string.power_discharging_duration,

                TEST_BATTERY_LEVEL_10,

                FIFTEEN_MIN_FORMATTED));

        assertThat(info2).contains(NORMAL_CASE_EXPECTED_PREFIX);

        assertThat(info2).doesNotContain(ENHANCED_SUFFIX);

        assertThat(info2).contains("%");

    }



    @Test
@@ -84,14 +92,14 @@ public class PowerUtilTest { 
                null /* percentageString */,

                false /* basedOnUsage */);



        // We only add special mention for the long string

        assertThat(info).isEqualTo(mContext.getString(

                R.string.power_remaining_duration_only_enhanced,

                FIFTEEN_MIN_FORMATTED));

        // We only have % when it is provided

        assertThat(info).contains(NORMAL_CASE_EXPECTED_PREFIX);

        assertThat(info).contains(ENHANCED_SUFFIX);

        assertThat(info).doesNotContain("%");

        // shortened string should not have extra text

        assertThat(info2).isEqualTo(mContext.getString(

                R.string.power_remaining_duration_only,

                FIFTEEN_MIN_FORMATTED));

        assertThat(info2).contains(NORMAL_CASE_EXPECTED_PREFIX);

        assertThat(info2).doesNotContain(ENHANCED_SUFFIX);

        assertThat(info2).doesNotContain("%");

    }
@@ -107,12 +115,9 @@ public class PowerUtilTest { 
                true /* basedOnUsage */);



        // additional battery percentage in this string

        assertThat(info).isEqualTo(mContext.getString(

                R.string.power_remaining_duration_shutdown_imminent,

                TEST_BATTERY_LEVEL_10));

        assertThat(info).isEqualTo("Phone may shutdown soon (10%)");

        // shortened string should not have percentage

        assertThat(info2).isEqualTo(mContext.getString(

                R.string.power_remaining_duration_only_shutdown_imminent));

        assertThat(info2).isEqualTo("Phone may shutdown soon");

    }



    @Test
@@ -127,35 +132,42 @@ public class PowerUtilTest { 
                true /* basedOnUsage */);



        // shortened string should not have percentage

        assertThat(info).isEqualTo(mContext.getString(

                R.string.power_remaining_less_than_duration_only,

                FIFTEEN_MIN_FORMATTED));

        assertThat(info).isEqualTo("Less than 15m remaining");

        // Add percentage to string when provided

        assertThat(info2).isEqualTo(mContext.getString(

                R.string.power_remaining_less_than_duration,

                TEST_BATTERY_LEVEL_10,

                FIFTEEN_MIN_FORMATTED));

        assertThat(info2).isEqualTo("Less than 15m remaining (10%)");

    }



    @Test

    public void testGetBatteryRemainingStringFormatted_moreThanOneDay_usesCorrectString() {

    public void testGetBatteryRemainingStringFormatted_betweenOneAndTwoDays_usesCorrectString() {

        String info = PowerUtil.getBatteryRemainingStringFormatted(mContext,

                TWO_DAYS_MILLIS,

                THIRTY_HOURS_MILLIS,

                null /* percentageString */,

                true /* basedOnUsage */);

        String info2 = PowerUtil.getBatteryRemainingStringFormatted(mContext,

                TWO_DAYS_MILLIS,

                THIRTY_HOURS_MILLIS,

                TEST_BATTERY_LEVEL_10 /* percentageString */,

                false /* basedOnUsage */);



        // We only add special mention for the long string

        assertThat(info).isEqualTo("About 1d 6h left based on your usage");

        // shortened string should not have extra text

        assertThat(info2).isEqualTo("About 1d 6h left (10%)");

    }



    @Test

    public void testGetBatteryRemainingStringFormatted_moreThanTwoDays_usesCorrectString() {

        String info = PowerUtil.getBatteryRemainingStringFormatted(mContext,

                THREE_DAYS_MILLIS,

                null /* percentageString */,

                true /* basedOnUsage */);

        String info2 = PowerUtil.getBatteryRemainingStringFormatted(mContext,

                THREE_DAYS_MILLIS,

                TEST_BATTERY_LEVEL_10 /* percentageString */,

                true /* basedOnUsage */);



        // shortened string should not have percentage

        assertThat(info).isEqualTo(mContext.getString(

                R.string.power_remaining_only_more_than_subtext,

                ONE_DAY_FORMATTED));

        assertThat(info).isEqualTo("More than 2 days remaining");

        // Add percentage to string when provided

        assertThat(info2).isEqualTo(mContext.getString(

                R.string.power_remaining_more_than_subtext,

                TEST_BATTERY_LEVEL_10,

                ONE_DAY_FORMATTED));

        assertThat(info2).isEqualTo("More than 2 days remaining (10%)");

    }

}

packages/SettingsLib/src/com/android/settingslib/utils/StringUtil.java

+62 −62

File changed.

Contains only whitespace changes.