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

Commit 7ac0f32c authored by Alan Viverette's avatar Alan Viverette
Browse files

Merge commit '75dfc87e' into manual_merge_75dfc87 

Change-Id: Ib55f65f9b00ea6c6515d3e4fc59d86351398b7e1
parents a349f8ce 75dfc87e

core/java/android/widget/CalendarView.java

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


package android.widget;



import com.android.internal.R;



import android.annotation.AttrRes;

import android.annotation.ColorInt;

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

import android.graphics.Rect;

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

core/java/android/widget/CalendarViewLegacyDelegate.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

core/java/android/widget/CalendarViewMaterialDelegate.java

+1 −2
Original line number Diff line number Diff line
@@ -19,11 +19,10 @@ package android.widget; 
import android.annotation.StyleRes;

import android.content.Context;

import android.graphics.Rect;

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;

core/java/android/widget/DatePicker.java

+4 −4
Original line number Diff line number Diff line
@@ -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.

core/java/android/widget/DatePickerCalendarDelegate.java

+1 −1
Original line number Diff line number Diff line
@@ -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;



/**