Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: If800b048973200d249b1f5c62af064392ed98d91
This commit is contained in:
Svetoslav Ganov
2010-12-29 22:39:54 -08:00
parent 03c5dd91a0
commit 25f84f323c
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/DatePicker.java
View File

@@ -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.

5
core/java/android/widget/TimePicker.java
View File

@@ -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;