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

Commit 4243dc39 authored by Svetoslav Ganov's avatar Svetoslav Ganov
Browse files

Updated the Time/Date pickers to be backwards compatible

bug:3349400

Change-Id: I2a3dda82caf7de0ed203306c89ee774b94b7d82e
parent 9f7e83b4
Loading
Loading
Loading
Loading
+164 −107
Original line number Diff line number Diff line
@@ -2721,6 +2721,17 @@
 visibility="public"
>
</field>
<field name="calendarViewStyle"
 type="int"
 transient="false"
 volatile="false"
 value="16843613"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="candidatesTextStyleSpans"
 type="int"
 transient="false"
@@ -3282,6 +3293,17 @@
 visibility="public"
>
</field>
<field name="datePickerStyle"
 type="int"
 transient="false"
 volatile="false"
 value="16843612"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="dateTextAppearance"
 type="int"
 transient="false"
@@ -8727,17 +8749,6 @@
 visibility="public"
>
</field>
<field name="solidColor"
 type="int"
 transient="false"
 volatile="false"
 value="16843594"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="soundEffectsEnabled"
 type="int"
 transient="false"
@@ -10905,6 +10916,17 @@
 visibility="public"
>
</field>
<field name="windowCloseOnTouchOutside"
 type="int"
 transient="false"
 volatile="false"
 value="16843611"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="windowContentOverlay"
 type="int"
 transient="false"
@@ -15982,7 +16004,7 @@
 type="int"
 transient="false"
 volatile="false"
 value="16974069"
 value="16974060"
 static="true"
 final="true"
 deprecated="not deprecated"
@@ -16033,44 +16055,44 @@
 visibility="public"
>
</field>
<field name="Widget_DropDownItem"
<field name="Widget_DatePicker"
 type="int"
 transient="false"
 volatile="false"
 value="16973867"
 value="16974063"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_DropDownItem_Spinner"
<field name="Widget_DropDownItem"
 type="int"
 transient="false"
 volatile="false"
 value="16973868"
 value="16973867"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_EditText"
<field name="Widget_DropDownItem_Spinner"
 type="int"
 transient="false"
 volatile="false"
 value="16973859"
 value="16973868"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_EditText_NumberPickerInputText"
<field name="Widget_EditText"
 type="int"
 transient="false"
 volatile="false"
 value="16974061"
 value="16973859"
 static="true"
 final="true"
 deprecated="not deprecated"
@@ -16268,7 +16290,7 @@
 type="int"
 transient="false"
 volatile="false"
 value="16974070"
 value="16974061"
 static="true"
 final="true"
 deprecated="not deprecated"
@@ -16308,44 +16330,44 @@
 visibility="public"
>
</field>
<field name="Widget_Holo_DropDownItem"
<field name="Widget_Holo_DatePicker"
 type="int"
 transient="false"
 volatile="false"
 value="16973995"
 value="16974064"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_Holo_DropDownItem_Spinner"
<field name="Widget_Holo_DropDownItem"
 type="int"
 transient="false"
 volatile="false"
 value="16973996"
 value="16973995"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_Holo_EditText"
<field name="Widget_Holo_DropDownItem_Spinner"
 type="int"
 transient="false"
 volatile="false"
 value="16973972"
 value="16973996"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_Holo_EditText_NumberPickerInputText"
<field name="Widget_Holo_EditText"
 type="int"
 transient="false"
 volatile="false"
 value="16974064"
 value="16973972"
 static="true"
 final="true"
 deprecated="not deprecated"
@@ -16396,28 +16418,6 @@
 visibility="public"
>
</field>
<field name="Widget_Holo_ImageButton_NumberPickerDownButton"
 type="int"
 transient="false"
 volatile="false"
 value="16974065"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_Holo_ImageButton_NumberPickerUpButton"
 type="int"
 transient="false"
 volatile="false"
 value="16974063"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_Holo_Light"
 type="int"
 transient="false"
@@ -16543,7 +16543,7 @@
 type="int"
 transient="false"
 volatile="false"
 value="16974071"
 value="16974062"
 static="true"
 final="true"
 deprecated="not deprecated"
@@ -16616,17 +16616,6 @@
 visibility="public"
>
</field>
<field name="Widget_Holo_Light_EditText_NumberPickerInputText"
 type="int"
 transient="false"
 volatile="false"
 value="16974067"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_Holo_Light_ExpandableListView"
 type="int"
 transient="false"
@@ -16671,28 +16660,6 @@
 visibility="public"
>
</field>
<field name="Widget_Holo_Light_ImageButton_NumberPickerDownButton"
 type="int"
 transient="false"
 volatile="false"
 value="16974068"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_Holo_Light_ImageButton_NumberPickerUpButton"
 type="int"
 transient="false"
 volatile="false"
 value="16974066"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_Holo_Light_ListPopupWindow"
 type="int"
 transient="false"
@@ -17221,28 +17188,6 @@
 visibility="public"
>
</field>
<field name="Widget_ImageButton_NumberPickerDownButton"
 type="int"
 transient="false"
 volatile="false"
 value="16974062"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_ImageButton_NumberPickerUpButton"
 type="int"
 transient="false"
 volatile="false"
 value="16974060"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_ImageWell"
 type="int"
 transient="false"
@@ -24311,6 +24256,19 @@
<parameter name="uri" type="android.net.Uri">
</parameter>
</method>
<method name="setFinishOnTouchOutside"
 return="void"
 abstract="false"
 native="false"
 synchronized="false"
 static="false"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
<parameter name="finish" type="boolean">
</parameter>
</method>
<method name="setIntent"
 return="void"
 abstract="false"
@@ -136099,6 +136057,17 @@
 visibility="public"
>
</method>
<method name="getPreserveEGLContextOnPause"
 return="boolean"
 abstract="false"
 native="false"
 synchronized="false"
 static="false"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
</method>
<method name="getRenderMode"
 return="int"
 abstract="false"
@@ -136270,6 +136239,19 @@
<parameter name="glWrapper" type="android.opengl.GLSurfaceView.GLWrapper">
</parameter>
</method>
<method name="setPreserveEGLContextOnPause"
 return="void"
 abstract="false"
 native="false"
 synchronized="false"
 static="false"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
<parameter name="preserveOnPause" type="boolean">
</parameter>
</method>
<method name="setRenderMode"
 return="void"
 abstract="false"
@@ -146702,6 +146684,16 @@
 visibility="public"
>
</constructor>
<constructor name="StrictMode.VmPolicy.Builder"
 type="android.os.StrictMode.VmPolicy.Builder"
 static="false"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
<parameter name="base" type="android.os.StrictMode.VmPolicy">
</parameter>
</constructor>
<method name="build"
 return="android.os.StrictMode.VmPolicy"
 abstract="false"
@@ -146779,6 +146771,21 @@
 visibility="public"
>
</method>
<method name="setClassInstanceLimit"
 return="android.os.StrictMode.VmPolicy.Builder"
 abstract="false"
 native="false"
 synchronized="false"
 static="false"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
<parameter name="klass" type="java.lang.Class">
</parameter>
<parameter name="instanceLimit" type="int">
</parameter>
</method>
</class>
<class name="SystemClock"
 extends="java.lang.Object"
@@ -219396,6 +219403,14 @@
<parameter name="view" type="android.view.View">
</parameter>
</constructor>
<constructor name="View.DragShadowBuilder"
 type="android.view.View.DragShadowBuilder"
 static="false"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
</constructor>
<method name="getView"
 return="android.view.View"
 abstract="false"
@@ -236046,6 +236061,48 @@
</parameter>
</method>
</class>
<class name="WebStorage.Origin"
 extends="java.lang.Object"
 abstract="false"
 static="true"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
<method name="getOrigin"
 return="java.lang.String"
 abstract="false"
 native="false"
 synchronized="false"
 static="false"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
</method>
<method name="getQuota"
 return="long"
 abstract="false"
 native="false"
 synchronized="false"
 static="false"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
</method>
<method name="getUsage"
 return="long"
 abstract="false"
 native="false"
 synchronized="false"
 static="false"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
</method>
</class>
<interface name="WebStorage.QuotaUpdater"
 abstract="true"
 static="true"
+41 −107
Original line number Diff line number Diff line
@@ -2721,6 +2721,17 @@
 visibility="public"
>
</field>
<field name="calendarViewStyle"
 type="int"
 transient="false"
 volatile="false"
 value="16843613"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="candidatesTextStyleSpans"
 type="int"
 transient="false"
@@ -3282,6 +3293,17 @@
 visibility="public"
>
</field>
<field name="datePickerStyle"
 type="int"
 transient="false"
 volatile="false"
 value="16843612"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="dateTextAppearance"
 type="int"
 transient="false"
@@ -8727,17 +8749,6 @@
 visibility="public"
>
</field>
<field name="solidColor"
 type="int"
 transient="false"
 volatile="false"
 value="16843594"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="soundEffectsEnabled"
 type="int"
 transient="false"
@@ -15993,7 +16004,7 @@
 type="int"
 transient="false"
 volatile="false"
 value="16974069"
 value="16974060"
 static="true"
 final="true"
 deprecated="not deprecated"
@@ -16044,44 +16055,44 @@
 visibility="public"
>
</field>
<field name="Widget_DropDownItem"
<field name="Widget_DatePicker"
 type="int"
 transient="false"
 volatile="false"
 value="16973867"
 value="16974063"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_DropDownItem_Spinner"
<field name="Widget_DropDownItem"
 type="int"
 transient="false"
 volatile="false"
 value="16973868"
 value="16973867"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_EditText"
<field name="Widget_DropDownItem_Spinner"
 type="int"
 transient="false"
 volatile="false"
 value="16973859"
 value="16973868"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_EditText_NumberPickerInputText"
<field name="Widget_EditText"
 type="int"
 transient="false"
 volatile="false"
 value="16974061"
 value="16973859"
 static="true"
 final="true"
 deprecated="not deprecated"
@@ -16279,7 +16290,7 @@
 type="int"
 transient="false"
 volatile="false"
 value="16974070"
 value="16974061"
 static="true"
 final="true"
 deprecated="not deprecated"
@@ -16319,44 +16330,44 @@
 visibility="public"
>
</field>
<field name="Widget_Holo_DropDownItem"
<field name="Widget_Holo_DatePicker"
 type="int"
 transient="false"
 volatile="false"
 value="16973995"
 value="16974064"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_Holo_DropDownItem_Spinner"
<field name="Widget_Holo_DropDownItem"
 type="int"
 transient="false"
 volatile="false"
 value="16973996"
 value="16973995"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_Holo_EditText"
<field name="Widget_Holo_DropDownItem_Spinner"
 type="int"
 transient="false"
 volatile="false"
 value="16973972"
 value="16973996"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_Holo_EditText_NumberPickerInputText"
<field name="Widget_Holo_EditText"
 type="int"
 transient="false"
 volatile="false"
 value="16974064"
 value="16973972"
 static="true"
 final="true"
 deprecated="not deprecated"
@@ -16407,28 +16418,6 @@
 visibility="public"
>
</field>
<field name="Widget_Holo_ImageButton_NumberPickerDownButton"
 type="int"
 transient="false"
 volatile="false"
 value="16974065"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_Holo_ImageButton_NumberPickerUpButton"
 type="int"
 transient="false"
 volatile="false"
 value="16974063"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_Holo_Light"
 type="int"
 transient="false"
@@ -16554,7 +16543,7 @@
 type="int"
 transient="false"
 volatile="false"
 value="16974071"
 value="16974062"
 static="true"
 final="true"
 deprecated="not deprecated"
@@ -16627,17 +16616,6 @@
 visibility="public"
>
</field>
<field name="Widget_Holo_Light_EditText_NumberPickerInputText"
 type="int"
 transient="false"
 volatile="false"
 value="16974067"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_Holo_Light_ExpandableListView"
 type="int"
 transient="false"
@@ -16682,28 +16660,6 @@
 visibility="public"
>
</field>
<field name="Widget_Holo_Light_ImageButton_NumberPickerDownButton"
 type="int"
 transient="false"
 volatile="false"
 value="16974068"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_Holo_Light_ImageButton_NumberPickerUpButton"
 type="int"
 transient="false"
 volatile="false"
 value="16974066"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_Holo_Light_ListPopupWindow"
 type="int"
 transient="false"
@@ -17232,28 +17188,6 @@
 visibility="public"
>
</field>
<field name="Widget_ImageButton_NumberPickerDownButton"
 type="int"
 transient="false"
 volatile="false"
 value="16974062"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_ImageButton_NumberPickerUpButton"
 type="int"
 transient="false"
 volatile="false"
 value="16974060"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="Widget_ImageWell"
 type="int"
 transient="false"
+8 −5
Original line number Diff line number Diff line
@@ -129,27 +129,30 @@ public class DatePicker extends FrameLayout {
    }

    public DatePicker(Context context, AttributeSet attrs) {
        this(context, attrs, 0);
        this(context, attrs, R.attr.datePickerStyle);
    }

    public DatePicker(Context context, AttributeSet attrs, int defStyle) {
        super(context, attrs, defStyle);

        TypedArray attributesArray = context.obtainStyledAttributes(attrs, R.styleable.DatePicker);
        TypedArray attributesArray = context.obtainStyledAttributes(attrs, R.styleable.DatePicker,
                defStyle, 0);
        boolean spinnersShown = attributesArray.getBoolean(R.styleable.DatePicker_spinnersShown,
                DEFAULT_SPINNERS_SHOWN);
        boolean calendarViewShown = attributesArray.getBoolean(
                R.styleable.DatePicker_calendarViewShown, DEFAULT_CALENDAR_VIEW_SHOWN);
        int startYear = attributesArray
                .getInt(R.styleable.DatePicker_startYear, DEFAULT_START_YEAR);
        int startYear = attributesArray.getInt(R.styleable.DatePicker_startYear,
                DEFAULT_START_YEAR);
        int endYear = attributesArray.getInt(R.styleable.DatePicker_endYear, DEFAULT_END_YEAR);
        String minDate = attributesArray.getString(R.styleable.DatePicker_minDate);
        String maxDate = attributesArray.getString(R.styleable.DatePicker_maxDate);
        int layoutResourceId = attributesArray.getResourceId(R.styleable.DatePicker_layout,
                R.layout.date_picker);
        attributesArray.recycle();

        LayoutInflater inflater = (LayoutInflater) context
                .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
        inflater.inflate(R.layout.date_picker, this, true);
        inflater.inflate(layoutResourceId, this, true);

        OnValueChangedListener onChangeListener = new OnValueChangedListener() {
            public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
+7 −5
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ import android.view.inputmethod.InputMethodManager;
 * <p>
 * For an example of using this widget, see {@link android.widget.TimePicker}.
 * </p>
 *
 * @attr ref android.R.styleable#NumberPicker_solidColor
 */
@Widget
public class NumberPicker extends LinearLayout {
@@ -324,6 +322,11 @@ public class NumberPicker extends LinearLayout {
     */
    private final int mSolidColor;

    /**
     * Flag indicating if this widget supports flinging.
     */
    private final boolean mFlingable;

    /**
     * Reusable {@link Rect} instance.
     */
@@ -427,9 +430,8 @@ public class NumberPicker extends LinearLayout {
        // process style attributes
        TypedArray attributesArray = context.obtainStyledAttributes(attrs,
                R.styleable.NumberPicker, defStyle, 0);
        int orientation = attributesArray.getInt(R.styleable.NumberPicker_orientation, VERTICAL);
        setOrientation(orientation);
        mSolidColor = attributesArray.getColor(R.styleable.NumberPicker_solidColor, 0);
        mFlingable = attributesArray.getBoolean(R.styleable.NumberPicker_flingable, true);
        attributesArray.recycle();

        // By default Linearlayout that we extend is not drawn. This is
@@ -563,7 +565,7 @@ public class NumberPicker extends LinearLayout {

    @Override
    public boolean onInterceptTouchEvent(MotionEvent event) {
        if (!isEnabled()) {
        if (!isEnabled() || !mFlingable) {
            return false;
        }
        switch (event.getActionMasked()) {
+182 −121

File changed.

Preview size limit exceeded, changes collapsed.

Loading