Small recurrence picker layout bugs.
Fixing look of recurrence label in edit event view when editing
an already-recurring event.
Removed "events" text which was accidentally showing in the end
group label when it shouldn't have been.
Bug: 8751056
Change-Id: Ic32f0d36b75bed17230c5f48e1bbe282155102bb
diff --git a/src/com/android/calendar/event/EditEventView.java b/src/com/android/calendar/event/EditEventView.java
index e025153..2ec8f67 100644
--- a/src/com/android/calendar/event/EditEventView.java
+++ b/src/com/android/calendar/event/EditEventView.java
@@ -1405,7 +1405,6 @@
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 @@
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 971260a..6de8439 100644
--- a/src/com/android/calendar/recurrencepicker/RecurrencePickerDialog.java
+++ b/src/com/android/calendar/recurrencepicker/RecurrencePickerDialog.java
@@ -1279,7 +1279,9 @@
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--;
}