diff options
| author | Sam Blitzstein <sblitz@google.com> | 2013-04-29 10:21:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-29 10:21:49 -0700 |
| commit | d2b0d8ab4a95e8a23ae949fe4bf570d3eae4728e (patch) | |
| tree | 536e501792af724a4b3fbaceb9434f70f09df469 /src/com | |
| parent | a65f4e875c8521e3714d340dbf293e37ee6d803a (diff) | |
| parent | 018f539c218940e0fad05c10552759e4fa2e77e4 (diff) | |
| download | android_packages_apps_Calendar-d2b0d8ab4a95e8a23ae949fe4bf570d3eae4728e.tar.gz android_packages_apps_Calendar-d2b0d8ab4a95e8a23ae949fe4bf570d3eae4728e.tar.bz2 android_packages_apps_Calendar-d2b0d8ab4a95e8a23ae949fe4bf570d3eae4728e.zip | |
am 018f539c: Small recurrence picker layout bugs.
* commit '018f539c218940e0fad05c10552759e4fa2e77e4':
Small recurrence picker layout bugs.
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/calendar/event/EditEventView.java | 2 | ||||
| -rw-r--r-- | src/com/android/calendar/recurrencepicker/RecurrencePickerDialog.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/calendar/event/EditEventView.java b/src/com/android/calendar/event/EditEventView.java index e025153f..2ec8f674 100644 --- a/src/com/android/calendar/event/EditEventView.java +++ b/src/com/android/calendar/event/EditEventView.java @@ -1405,7 +1405,6 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa mCalendarSelectorGroup.setVisibility(View.GONE); mCalendarStaticGroup.setVisibility(View.VISIBLE); mRruleButton.setEnabled(false); - mRruleButton.setBackgroundDrawable(null); if (EditEventHelper.canAddReminders(mModel)) { mRemindersGroup.setVisibility(View.VISIBLE); } else { @@ -1443,6 +1442,7 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa mRruleButton.setEnabled(true); } else { mRruleButton.setEnabled(false); + mRruleButton.setBackgroundDrawable(null); } mRemindersGroup.setVisibility(View.VISIBLE); diff --git a/src/com/android/calendar/recurrencepicker/RecurrencePickerDialog.java b/src/com/android/calendar/recurrencepicker/RecurrencePickerDialog.java index 971260ad..6de84390 100644 --- a/src/com/android/calendar/recurrencepicker/RecurrencePickerDialog.java +++ b/src/com/android/calendar/recurrencepicker/RecurrencePickerDialog.java @@ -1279,7 +1279,9 @@ public class RecurrencePickerDialog extends DialogFragment implements OnItemSele mPostEndCount.setText(endString.subSequence(postTextStart, endString.length())); // In case it's a recycled view that wasn't visible. - mPostEndCount.setVisibility(View.VISIBLE); + if (mModel.end == RecurrenceModel.END_BY_COUNT) { + mPostEndCount.setVisibility(View.VISIBLE); + } if (endString.charAt(markerStart - 1) == ' ') { markerStart--; } |