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

Commit 2801e6de authored by Calvin Pan's avatar Calvin Pan Committed by Android (Google) Code Review
Browse files

Merge changes Ib484fc0c,I2b9ff69c,I0a31b117,I888c65c8,I03723cfe, ... 

* changes:
  Clean <plurals> in DateTimeView
  Clean <plurals> in CertificateMonitor
  Clean <plurals> in FillUi
  Clean <plurals> in BugreportProgressService
  Clean <plurals> in keyguard
  Clean <plurals> in ChooserActivity
  Clear <plurals> in TextUtils
  Clean <plurals> in FindActionModeCallback
  Clean <plurals> in ZenModeConfig
  Add util class for plurals
parents 31ee9403 e4692b7c

boot/hiddenapi/hiddenapi-max-target-q.txt

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ Lcom/android/internal/R$layout;->select_dialog_multichoice:I 
Lcom/android/internal/R$layout;->select_dialog_singlechoice:I

Lcom/android/internal/R$layout;->webview_find:I

Lcom/android/internal/R$layout;->zoom_magnify:I

Lcom/android/internal/R$plurals;->matches_found:I

Lcom/android/internal/R$string;->matches_found:I

Lcom/android/internal/R$raw;->loaderror:I

Lcom/android/internal/R$raw;->nodomain:I

Lcom/android/internal/R$string;->byteShort:I

core/java/android/service/notification/ZenModeConfig.java

+20 −12
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import android.text.TextUtils; 
import android.text.format.DateFormat;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.PluralsMessageFormatter;

import android.util.Slog;

import android.util.TypedXmlPullParser;

import android.util.TypedXmlSerializer;
@@ -63,8 +64,10 @@ import java.util.Arrays; 
import java.util.Calendar;

import java.util.Date;

import java.util.GregorianCalendar;

import java.util.HashMap;

import java.util.List;

import java.util.Locale;

import java.util.Map;

import java.util.Objects;

import java.util.TimeZone;

import java.util.UUID;
@@ -1333,25 +1336,30 @@ public class ZenModeConfig implements Parcelable { 
        final CharSequence formattedTime =

                getFormattedTime(context, time, isToday(time), userHandle);

        final Resources res = context.getResources();

        final Map<String, Object> arguments = new HashMap<>();

        if (minutes < 60) {

            // display as minutes

            num = minutes;

            int summaryResId = shortVersion ? R.plurals.zen_mode_duration_minutes_summary_short

                    : R.plurals.zen_mode_duration_minutes_summary;

            summary = res.getQuantityString(summaryResId, num, num, formattedTime);

            int line1ResId = shortVersion ? R.plurals.zen_mode_duration_minutes_short

                    : R.plurals.zen_mode_duration_minutes;

            line1 = res.getQuantityString(line1ResId, num, num, formattedTime);

            int summaryResId = shortVersion ? R.string.zen_mode_duration_minutes_summary_short

                    : R.string.zen_mode_duration_minutes_summary;

            arguments.put("count", num);

            arguments.put("formattedTime", formattedTime);

            summary = PluralsMessageFormatter.format(res, arguments, summaryResId);

            int line1ResId = shortVersion ? R.string.zen_mode_duration_minutes_short

                    : R.string.zen_mode_duration_minutes;

            line1 = PluralsMessageFormatter.format(res, arguments, line1ResId);

            line2 = res.getString(R.string.zen_mode_until, formattedTime);

        } else if (minutes < DAY_MINUTES) {

            // display as hours

            num =  Math.round(minutes / 60f);

            int summaryResId = shortVersion ? R.plurals.zen_mode_duration_hours_summary_short

                    : R.plurals.zen_mode_duration_hours_summary;

            summary = res.getQuantityString(summaryResId, num, num, formattedTime);

            int line1ResId = shortVersion ? R.plurals.zen_mode_duration_hours_short

                    : R.plurals.zen_mode_duration_hours;

            line1 = res.getQuantityString(line1ResId, num, num, formattedTime);

            int summaryResId = shortVersion ? R.string.zen_mode_duration_hours_summary_short

                    : R.string.zen_mode_duration_hours_summary;

            arguments.put("count", num);

            arguments.put("formattedTime", formattedTime);

            summary = PluralsMessageFormatter.format(res, arguments, summaryResId);

            int line1ResId = shortVersion ? R.string.zen_mode_duration_hours_short

                    : R.string.zen_mode_duration_hours;

            line1 = PluralsMessageFormatter.format(res, arguments, line1ResId);

            line2 = res.getString(R.string.zen_mode_until, formattedTime);

        } else {

            // display as day/time

core/java/android/text/TextUtils.java

+0 −9
Original line number Diff line number Diff line
@@ -2070,15 +2070,6 @@ public class TextUtils { 
            : View.LAYOUT_DIRECTION_LTR;

    }



    /**

     * Return localized string representing the given number of selected items.

     *

     * @hide

     */

    public static CharSequence formatSelectedCount(int count) {

        return Resources.getSystem().getQuantityString(R.plurals.selected_count, count, count);

    }



    /**

     * Simple alternative to {@link String#format} which purposefully supports

     * only a small handful of substitutions to improve execution speed.

core/java/android/util/PluralsMessageFormatter.java

0 → 100644
+44 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.util;



import android.annotation.NonNull;

import android.annotation.StringRes;

import android.content.res.Resources;

import android.icu.text.MessageFormat;



import java.util.Map;



/**

 * Helper class for easier formatting of ICU {@link android.icu.text.MessageFormat} syntax.

 * @hide

 */

public class PluralsMessageFormatter {

    /**

     * Formatting the ICU {@link android.icu.text.MessageFormat} syntax

     *

     * @param resources the {@link android.content.res.Resources}

     * @param arguments the mapping of argument names and values

     * @param messageId the string resource id with {@link android.icu.text.MessageFormat} syntax

     * @return the formatted result

     */

    public static String format(@NonNull Resources resources,

            Map<String, Object> arguments,

            @StringRes int messageId) {

        return new MessageFormat(resources.getString(messageId)).format(arguments);

    }

}

core/java/android/webkit/DateSorter.java

+9 −3
Original line number Diff line number Diff line
@@ -18,11 +18,14 @@ package android.webkit; 


import android.content.Context;

import android.content.res.Resources;

import android.util.PluralsMessageFormatter;



import com.android.icu.text.DateSorterBridge;



import java.util.Calendar;

import java.util.HashMap;

import java.util.Locale;

import java.util.Map;



/**

 * Sorts dates into the following groups:
@@ -73,9 +76,12 @@ public class DateSorter { 
        mLabels[0] = dateSorterBridge.getToday();

        mLabels[1] = dateSorterBridge.getYesterday();



        int resId = com.android.internal.R.plurals.last_num_days;

        String format = resources.getQuantityString(resId, NUM_DAYS_AGO);

        mLabels[2] = String.format(format, NUM_DAYS_AGO);

        Map<String, Object> arguments = new HashMap<>();

        arguments.put("count", NUM_DAYS_AGO);

        mLabels[2] = PluralsMessageFormatter.format(

                resources,

                arguments,

                com.android.internal.R.string.last_num_days);



        mLabels[3] = context.getString(com.android.internal.R.string.last_month);

        mLabels[4] = context.getString(com.android.internal.R.string.older);