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

Commit 05f3bf50 authored by vichang's avatar vichang Committed by Gerrit Code Review
Browse files

Merge "Move yesterday/today Strings from LocaleData into a new ICU class"

parents d78a3539 b8fd6681
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -19,11 +19,11 @@ package android.webkit;
import android.content.Context;
import android.content.res.Resources;

import com.android.icu.text.DateSorterBridge;

import java.util.Calendar;
import java.util.Locale;

import libcore.icu.LocaleData;

/**
 * Sorts dates into the following groups:
 *   Today
@@ -69,9 +69,9 @@ public class DateSorter {
        if (locale == null) {
            locale = Locale.getDefault();
        }
        LocaleData localeData = LocaleData.get(locale);
        mLabels[0] = localeData.today;
        mLabels[1] = localeData.yesterday;
        DateSorterBridge dateSorterBridge = DateSorterBridge.createInstance(locale);
        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);