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

Commit 7f1a9653 authored by Xinyi Mao's avatar Xinyi Mao Committed by Android (Google) Code Review
Browse files

Merge "Fix talkback focus on "Less than a min"" into main

parents 1a683a10 ff3786f4

res/values/strings.xml

+4 −4
Original line number Diff line number Diff line
@@ -6005,13 +6005,13 @@ 
    <!-- [CHAR_LIMIT=NONE] Battery app usage section header since last full charge to slot_timestamp. Please use similar text with tc/7309909074935858949 -->

    <string name="battery_app_usage_since_last_full_charge_to">App usage since last full charge to <xliff:g id="slot_timestamp" example="Friday 10 am">%s</xliff:g></string>

    <!-- [CHAR_LIMIT=NONE] Battery usage item for total usage time less than a minute -->

    <string name="battery_usage_total_less_than_one_minute">Total: less than a min</string>

    <string name="battery_usage_total_less_than_one_minute">Total: less than a minute</string>

    <!-- [CHAR_LIMIT=NONE] Battery usage item for total background time less than a minute -->

    <string name="battery_usage_background_less_than_one_minute">Background: less than a min</string>

    <string name="battery_usage_background_less_than_one_minute">Background: less than a minute</string>

    <!-- [CHAR_LIMIT=NONE] Device screen on time less than a minute -->

    <string name="battery_usage_screen_time_less_than_one_minute">Screen time: less than a min</string>

    <string name="battery_usage_screen_time_less_than_one_minute">Screen time: less than a minute</string>

    <!-- [CHAR_LIMIT=NONE] Power usage time less than a minute -->

    <string name="power_usage_time_less_than_one_minute">Less than a min</string>

    <string name="power_usage_time_less_than_one_minute">Less than a minute</string>

    <!-- [CHAR_LIMIT=NONE] Battery usage item for total usage time -->

    <string name="battery_usage_for_total_time">Total: <xliff:g id="time">%s</xliff:g></string>

    <!-- [CHAR_LIMIT=NONE] Battery usage item for background usage time -->

tests/robotests/src/com/android/settings/fuelgauge/PowerUsageTimeControllerTest.java

+5 −5
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ public final class PowerUsageTimeControllerTest { 


        verifyAllPreferencesVisible(true);

        verify(mScreenTimePreference).setTimeSummary("1 min");

        verify(mBackgroundTimePreference).setTimeSummary("Less than a min");

        verify(mBackgroundTimePreference).setTimeSummary("Less than a minute");

    }



    @Test
@@ -190,7 +190,7 @@ public final class PowerUsageTimeControllerTest { 
                /* anomalyHintText= */ null);



        verifyAllPreferencesVisible(true);

        verify(mScreenTimePreference).setTimeSummary("Less than a min");

        verify(mScreenTimePreference).setTimeSummary("Less than a minute");

        verify(mBackgroundTimePreference).setTimeSummary("2 min");

    }
@@ -207,8 +207,8 @@ public final class PowerUsageTimeControllerTest { 
                /* anomalyHintText= */ null);



        verifyAllPreferencesVisible(true);

        verify(mScreenTimePreference).setTimeSummary("Less than a min");

        verify(mBackgroundTimePreference).setTimeSummary("Less than a min");

        verify(mScreenTimePreference).setTimeSummary("Less than a minute");

        verify(mBackgroundTimePreference).setTimeSummary("Less than a minute");

    }



    @Test
@@ -258,7 +258,7 @@ public final class PowerUsageTimeControllerTest { 
                TEST_ANOMALY_HINT_TEXT);



        verifyAllPreferencesVisible(true);

        verify(mScreenTimePreference).setTimeSummary("Less than a min");

        verify(mScreenTimePreference).setTimeSummary("Less than a minute");

        verify(mScreenTimePreference).setAnomalyHint(TEST_ANOMALY_HINT_TEXT);

        verify(mBackgroundTimePreference, never()).setAnomalyHint(anyString());

    }

tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ public final class BatteryUsageBreakdownControllerTest { 
                        /* foregroundUsageTimeInMs= */ DateUtils.MINUTE_IN_MILLIS - 1,

                        /* foregroundServiceUsageTimeInMs= */ 0,

                        /* backgroundUsageTimeInMs= */ 0));

        assertThat(pref.getSummary().toString()).isEqualTo("Total: less than a min");

        assertThat(pref.getSummary().toString()).isEqualTo("Total: less than a minute");

    }



    @Test
@@ -432,7 +432,7 @@ public final class BatteryUsageBreakdownControllerTest { 
                        /* foregroundServiceUsageTimeInMs= */ 0,

                        /* backgroundUsageTimeInMs= */ DateUtils.MINUTE_IN_MILLIS - 1));

        assertThat(pref.getSummary().toString())

                .isEqualTo("Screen time: less than a min\nBackground: less than a min");

                .isEqualTo("Screen time: less than a minute\nBackground: less than a minute");

    }



    private BatteryDiffEntry createBatteryDiffEntry(