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

Commit 7046d967 authored by Victor Chang's avatar Victor Chang Committed by Automerger Merge Worker
Browse files

Merge "Add ByteResult.unitsContentDescription field" into main am: 5a8ff9e0 am: ff60d1de 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3067182



Change-Id: I059e9a23b17af29d219df4205cd38927b28f815f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9590dca4 ff60d1de

core/java/android/text/format/Formatter.java

+18 −11
Original line number Diff line number Diff line
@@ -56,11 +56,18 @@ public final class Formatter { 
    public static class BytesResult {

        public final String value;

        public final String units;

        /**

         * Content description of the {@link #units}.

         * See {@link View#setContentDescription(CharSequence)}

         */

        public final String unitsContentDescription;

        public final long roundedBytes;



        public BytesResult(String value, String units, long roundedBytes) {

        public BytesResult(String value, String units, String unitsContentDescription,

                long roundedBytes) {

            this.value = value;

            this.units = units;

            this.unitsContentDescription = unitsContentDescription;

            this.roundedBytes = roundedBytes;

        }

    }
@@ -271,20 +278,20 @@ public final class Formatter { 
        final Locale locale = res.getConfiguration().getLocales().get(0);

        final NumberFormat numberFormatter = getNumberFormatter(locale, rounded.fractionDigits);

        final String formattedNumber = numberFormatter.format(rounded.value);

        final String units;

        if (rounded.units == MeasureUnit.BYTE) {

            // ICU spells out "byte" instead of "B".

            units = getByteSuffixOverride(res);

        } else {

        // Since ICU does not give us access to the pattern, we need to extract the unit string

        // from ICU, which we do by taking out the formatted number out of the formatted string

        // and trimming the result of spaces and controls.

        final String formattedMeasure = formatMeasureShort(

                locale, numberFormatter, rounded.value, rounded.units);

        final String numberRemoved = deleteFirstFromString(formattedMeasure, formattedNumber);

            units = SPACES_AND_CONTROLS.trim(numberRemoved).toString();

        String units = SPACES_AND_CONTROLS.trim(numberRemoved).toString();

        String unitsContentDescription = units;

        if (rounded.units == MeasureUnit.BYTE) {

            // ICU spells out "byte" instead of "B".

            units = getByteSuffixOverride(res);

        }

        return new BytesResult(formattedNumber, units, rounded.roundedBytes);

        return new BytesResult(formattedNumber, units, unitsContentDescription,

                rounded.roundedBytes);

    }



    /**