diff options
10 files changed, 18 insertions, 20 deletions
diff --git a/core/java/android/widget/CalendarView.java b/core/java/android/widget/CalendarView.java index 66896ab70e45..ac44033c21c6 100644 --- a/core/java/android/widget/CalendarView.java +++ b/core/java/android/widget/CalendarView.java @@ -16,6 +16,8 @@ package android.widget; +import com.android.internal.R; + import android.annotation.AttrRes; import android.annotation.ColorInt; import android.annotation.DrawableRes; @@ -27,17 +29,16 @@ import android.content.Context; import android.content.res.Configuration; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; +import android.icu.util.Calendar; +import android.icu.util.TimeZone; import android.util.AttributeSet; import android.util.Log; -import com.android.internal.R; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Locale; -import java.util.TimeZone; /** * This class is a calendar widget for displaying and selecting dates. The diff --git a/core/java/android/widget/CalendarViewLegacyDelegate.java b/core/java/android/widget/CalendarViewLegacyDelegate.java index f540479ad641..2b91713e3fed 100644 --- a/core/java/android/widget/CalendarViewLegacyDelegate.java +++ b/core/java/android/widget/CalendarViewLegacyDelegate.java @@ -27,6 +27,7 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Rect; import android.graphics.drawable.Drawable; +import android.icu.util.Calendar; import android.text.format.DateUtils; import android.util.AttributeSet; import android.util.DisplayMetrics; @@ -37,7 +38,6 @@ import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; -import java.util.Calendar; import java.util.Locale; import libcore.icu.LocaleData; diff --git a/core/java/android/widget/CalendarViewMaterialDelegate.java b/core/java/android/widget/CalendarViewMaterialDelegate.java index 0ed75d5f7a42..07b20007f8fa 100644 --- a/core/java/android/widget/CalendarViewMaterialDelegate.java +++ b/core/java/android/widget/CalendarViewMaterialDelegate.java @@ -18,11 +18,10 @@ package android.widget; import android.annotation.StyleRes; import android.content.Context; +import android.icu.util.Calendar; import android.util.AttributeSet; import android.widget.DayPickerView.OnDaySelectedListener; -import java.util.Calendar; - class CalendarViewMaterialDelegate extends CalendarView.AbstractCalendarViewDelegate { private final DayPickerView mDayPickerView; diff --git a/core/java/android/widget/DatePicker.java b/core/java/android/widget/DatePicker.java index 0c5edc5f2f81..8613f9989abc 100644 --- a/core/java/android/widget/DatePicker.java +++ b/core/java/android/widget/DatePicker.java @@ -16,11 +16,15 @@ package android.widget; +import com.android.internal.R; + import android.annotation.Nullable; import android.annotation.Widget; import android.content.Context; import android.content.res.Configuration; import android.content.res.TypedArray; +import android.icu.util.Calendar; +import android.icu.util.TimeZone; import android.os.Parcel; import android.os.Parcelable; import android.util.AttributeSet; @@ -28,11 +32,7 @@ import android.util.SparseArray; import android.view.View; import android.view.accessibility.AccessibilityEvent; -import com.android.internal.R; - -import java.util.Calendar; import java.util.Locale; -import java.util.TimeZone; /** * Provides a widget for selecting a date. diff --git a/core/java/android/widget/DatePickerCalendarDelegate.java b/core/java/android/widget/DatePickerCalendarDelegate.java index 0a23b34b9195..2c80f2811cac 100755 --- a/core/java/android/widget/DatePickerCalendarDelegate.java +++ b/core/java/android/widget/DatePickerCalendarDelegate.java @@ -26,6 +26,7 @@ import android.content.res.Resources; import android.content.res.TypedArray; import android.icu.text.DisplayContext; import android.icu.text.SimpleDateFormat; +import android.icu.util.Calendar; import android.os.Parcelable; import android.text.format.DateFormat; import android.text.format.DateUtils; @@ -40,7 +41,6 @@ import android.view.accessibility.AccessibilityEvent; import android.widget.DayPickerView.OnDaySelectedListener; import android.widget.YearPickerView.OnYearSelectedListener; -import java.util.Calendar; import java.util.Locale; /** diff --git a/core/java/android/widget/DatePickerSpinnerDelegate.java b/core/java/android/widget/DatePickerSpinnerDelegate.java index d8a3c5638b72..17af014c5119 100644 --- a/core/java/android/widget/DatePickerSpinnerDelegate.java +++ b/core/java/android/widget/DatePickerSpinnerDelegate.java @@ -19,6 +19,7 @@ package android.widget; import android.content.Context; import android.content.res.Configuration; import android.content.res.TypedArray; +import android.icu.util.Calendar; import android.os.Parcelable; import android.text.InputType; import android.text.TextUtils; @@ -37,7 +38,6 @@ import java.text.DateFormatSymbols; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Arrays; -import java.util.Calendar; import java.util.Locale; import libcore.icu.ICU; diff --git a/core/java/android/widget/DayPickerPagerAdapter.java b/core/java/android/widget/DayPickerPagerAdapter.java index 97936e7c7c5b..9f02b4485dc0 100644 --- a/core/java/android/widget/DayPickerPagerAdapter.java +++ b/core/java/android/widget/DayPickerPagerAdapter.java @@ -25,14 +25,13 @@ import android.annotation.Nullable; import android.content.Context; import android.content.res.ColorStateList; import android.content.res.TypedArray; +import android.icu.util.Calendar; import android.util.SparseArray; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.SimpleMonthView.OnDayClickListener; -import java.util.Calendar; - /** * An adapter for a list of {@link android.widget.SimpleMonthView} items. */ diff --git a/core/java/android/widget/DayPickerView.java b/core/java/android/widget/DayPickerView.java index dc772fbf63dc..ab89c1f0b534 100644 --- a/core/java/android/widget/DayPickerView.java +++ b/core/java/android/widget/DayPickerView.java @@ -24,6 +24,7 @@ import android.annotation.Nullable; import android.content.Context; import android.content.res.ColorStateList; import android.content.res.TypedArray; +import android.icu.util.Calendar; import android.util.AttributeSet; import android.util.MathUtils; import android.view.LayoutInflater; @@ -31,7 +32,6 @@ import android.view.View; import android.view.ViewGroup; import android.view.accessibility.AccessibilityManager; -import java.util.Calendar; import java.util.Locale; import libcore.icu.LocaleData; diff --git a/core/java/android/widget/SimpleMonthView.java b/core/java/android/widget/SimpleMonthView.java index 97d834a85681..588425fdee66 100644 --- a/core/java/android/widget/SimpleMonthView.java +++ b/core/java/android/widget/SimpleMonthView.java @@ -32,6 +32,7 @@ import android.graphics.Rect; import android.graphics.Typeface; import android.icu.text.DisplayContext; import android.icu.text.SimpleDateFormat; +import android.icu.util.Calendar; import android.os.Bundle; import android.text.TextPaint; import android.text.format.DateFormat; @@ -48,7 +49,6 @@ import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction; import java.text.NumberFormat; -import java.util.Calendar; import java.util.Locale; import libcore.icu.LocaleData; diff --git a/core/java/android/widget/YearPickerView.java b/core/java/android/widget/YearPickerView.java index 96624d2f0617..a3f5a67baca1 100644 --- a/core/java/android/widget/YearPickerView.java +++ b/core/java/android/widget/YearPickerView.java @@ -16,18 +16,17 @@ package android.widget; +import com.android.internal.R; + import android.content.Context; import android.content.res.Resources; +import android.icu.util.Calendar; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.accessibility.AccessibilityEvent; -import java.util.Calendar; - -import com.android.internal.R; - /** * Displays a selectable list of years. */ |