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

Commit 4615fefa authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

Merge "Use ICU\'s Calendar class in date picker & related classes" into nyc-dev am: cfbca564 

am: ffa81d04

* commit 'ffa81d04':
  Use ICU's Calendar class in date picker & related classes

Change-Id: I2f40f390324f46849e35a114760ed8a4542a87c6
parents 87cc0321 ffa81d04

core/java/android/widget/CalendarView.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -16,6 +16,8 @@ 




package android.widget;

package android.widget;





import com.android.internal.R;



import android.annotation.AttrRes;

import android.annotation.AttrRes;

import android.annotation.ColorInt;

import android.annotation.ColorInt;

import android.annotation.DrawableRes;

import android.annotation.DrawableRes;
@@ -27,17 +29,16 @@ import android.content.Context; 
import android.content.res.Configuration;

import android.content.res.Configuration;

import android.content.res.TypedArray;

import android.content.res.TypedArray;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.icu.util.Calendar;

import android.icu.util.TimeZone;

import android.util.AttributeSet;

import android.util.AttributeSet;

import android.util.Log;

import android.util.Log;

import com.android.internal.R;





import java.text.DateFormat;

import java.text.DateFormat;

import java.text.ParseException;

import java.text.ParseException;

import java.text.SimpleDateFormat;

import java.text.SimpleDateFormat;

import java.util.Calendar;

import java.util.Date;

import java.util.Date;

import java.util.Locale;

import java.util.Locale;

import java.util.TimeZone;





/**

/**

 * This class is a calendar widget for displaying and selecting dates. The

 * This class is a calendar widget for displaying and selecting dates. The

core/java/android/widget/CalendarViewLegacyDelegate.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ import android.graphics.Canvas; 
import android.graphics.Paint;

import android.graphics.Paint;

import android.graphics.Rect;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.icu.util.Calendar;

import android.text.format.DateUtils;

import android.text.format.DateUtils;

import android.util.AttributeSet;

import android.util.AttributeSet;

import android.util.DisplayMetrics;

import android.util.DisplayMetrics;
@@ -37,7 +38,6 @@ import android.view.MotionEvent; 
import android.view.View;

import android.view.View;

import android.view.ViewGroup;

import android.view.ViewGroup;





import java.util.Calendar;

import java.util.Locale;

import java.util.Locale;





import libcore.icu.LocaleData;

import libcore.icu.LocaleData;

core/java/android/widget/CalendarViewMaterialDelegate.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -18,11 +18,10 @@ package android.widget; 




import android.annotation.StyleRes;

import android.annotation.StyleRes;

import android.content.Context;

import android.content.Context;

import android.icu.util.Calendar;

import android.util.AttributeSet;

import android.util.AttributeSet;

import android.widget.DayPickerView.OnDaySelectedListener;

import android.widget.DayPickerView.OnDaySelectedListener;





import java.util.Calendar;



class CalendarViewMaterialDelegate extends CalendarView.AbstractCalendarViewDelegate {

class CalendarViewMaterialDelegate extends CalendarView.AbstractCalendarViewDelegate {

    private final DayPickerView mDayPickerView;

    private final DayPickerView mDayPickerView;

core/java/android/widget/DatePicker.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -16,11 +16,15 @@ 




package android.widget;

package android.widget;





import com.android.internal.R;



import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.Widget;

import android.annotation.Widget;

import android.content.Context;

import android.content.Context;

import android.content.res.Configuration;

import android.content.res.Configuration;

import android.content.res.TypedArray;

import android.content.res.TypedArray;

import android.icu.util.Calendar;

import android.icu.util.TimeZone;

import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;

import android.util.AttributeSet;

import android.util.AttributeSet;
@@ -28,11 +32,7 @@ import android.util.SparseArray; 
import android.view.View;

import android.view.View;

import android.view.accessibility.AccessibilityEvent;

import android.view.accessibility.AccessibilityEvent;





import com.android.internal.R;



import java.util.Calendar;

import java.util.Locale;

import java.util.Locale;

import java.util.TimeZone;





/**

/**

 * Provides a widget for selecting a date.

 * Provides a widget for selecting a date.

core/java/android/widget/DatePickerCalendarDelegate.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ import android.content.res.Resources; 
import android.content.res.TypedArray;

import android.content.res.TypedArray;

import android.icu.text.DisplayContext;

import android.icu.text.DisplayContext;

import android.icu.text.SimpleDateFormat;

import android.icu.text.SimpleDateFormat;

import android.icu.util.Calendar;

import android.os.Parcelable;

import android.os.Parcelable;

import android.text.format.DateFormat;

import android.text.format.DateFormat;

import android.text.format.DateUtils;

import android.text.format.DateUtils;
@@ -40,7 +41,6 @@ import android.view.accessibility.AccessibilityEvent; 
import android.widget.DayPickerView.OnDaySelectedListener;

import android.widget.DayPickerView.OnDaySelectedListener;

import android.widget.YearPickerView.OnYearSelectedListener;

import android.widget.YearPickerView.OnYearSelectedListener;





import java.util.Calendar;

import java.util.Locale;

import java.util.Locale;





/**

/**