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

Commit 25f84f32 authored by Svetoslav Ganov's avatar Svetoslav Ganov
Browse files

3316147 TimePicker and DatePicker is editable even after the first setEnabled(false). 

Change-Id: If800b048973200d249b1f5c62af064392ed98d91
parent 03c5dd91

core/java/android/widget/DatePicker.java

+3 −1
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ public class DatePicker extends FrameLayout { 


    private static final boolean DEFAULT_SPINNERS_SHOWN = true;



    private static final boolean DEFAULT_ENABLED_STATE = true;



    private final NumberPicker mDaySpinner;



    private final LinearLayout mSpinners;
@@ -103,7 +105,7 @@ public class DatePicker extends FrameLayout { 


    private final Calendar mCurrentDate = Calendar.getInstance();



    private boolean mIsEnabled;

    private boolean mIsEnabled = DEFAULT_ENABLED_STATE;



    /**

     * The callback used to indicate the user changes\d the date.

core/java/android/widget/TimePicker.java

+4 −1
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ import java.util.Calendar; 
@Widget

public class TimePicker extends FrameLayout {



    private static final boolean DEFAULT_ENABLED_STATE = true;



    /**

     * A no-op callback used in the constructor to avoid null checks

     * later in the code.
@@ -75,7 +77,7 @@ public class TimePicker extends FrameLayout { 


    private final String[] mAmPmStrings;



    private boolean mIsEnabled;

    private boolean mIsEnabled = DEFAULT_ENABLED_STATE;



    // callbacks

    private OnTimeChangedListener mOnTimeChangedListener;
@@ -195,6 +197,7 @@ public class TimePicker extends FrameLayout { 
        }

        super.setEnabled(enabled);

        mMinuteSpinner.setEnabled(enabled);

        mDivider.setEnabled(enabled);

        mHourSpinner.setEnabled(enabled);

        mAmPmSpinner.setEnabled(enabled);

        mIsEnabled = enabled;