Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move yesterday/today Strings from LocaleData into a new ICU class" am: 05f3bf50d6

Browse Source 
Change-Id: I2d0ee634835667f3f738d2131082ea3ce67570a5
This commit is contained in:
Automerger Merge Worker
2020-03-12 18:31:28 +00:00
parent 0366471ef2 05f3bf50d6
commit c1130c259b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/webkit/DateSorter.java
View File

@@ -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);