3316147 TimePicker and DatePicker is editable even after the first setEnabled(false).
Change-Id: If800b048973200d249b1f5c62af064392ed98d91
diff --git a/core/java/android/widget/DatePicker.java b/core/java/android/widget/DatePicker.java
index 493b881..821e1f6 100644
--- a/core/java/android/widget/DatePicker.java
+++ b/core/java/android/widget/DatePicker.java
@@ -75,6 +75,8 @@
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 @@
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.
diff --git a/core/java/android/widget/TimePicker.java b/core/java/android/widget/TimePicker.java
index 107ea07..8f3442e 100644
--- a/core/java/android/widget/TimePicker.java
+++ b/core/java/android/widget/TimePicker.java
@@ -52,6 +52,8 @@
@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 @@
private final String[] mAmPmStrings;
- private boolean mIsEnabled;
+ private boolean mIsEnabled = DEFAULT_ENABLED_STATE;
// callbacks
private OnTimeChangedListener mOnTimeChangedListener;
@@ -195,6 +197,7 @@
}
super.setEnabled(enabled);
mMinuteSpinner.setEnabled(enabled);
+ mDivider.setEnabled(enabled);
mHourSpinner.setEnabled(enabled);
mAmPmSpinner.setEnabled(enabled);
mIsEnabled = enabled;