Skip to content

Commit a2cdaf7

Browse files
Lionel MamaneGitsaibot
authored andcommitted
gh#1457 set default duration on switch to non-AllDay
1 parent 97cd1bd commit a2cdaf7

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

app/src/main/java/com/android/calendar/event/EditEventView.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -885,6 +885,9 @@ public void setModel(CalendarEventModel model) {
885885
@Override
886886
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
887887
setAllDayViewsVisibility(isChecked);
888+
if(!isChecked) {
889+
resetToDefaultDuration();
890+
}
888891
}
889892
});
890893

@@ -1433,6 +1436,15 @@ private void setTime(TextView view, long millis) {
14331436
view.setText(timeString);
14341437
}
14351438

1439+
protected void resetToDefaultDuration() {
1440+
mEndTime.setDay(mEndTime.getDay() - 1);
1441+
mEndTime.set(mStartTime.normalize() +
1442+
Utils.getDefaultEventDurationInMillis(mActivity));
1443+
long endMillis = mEndTime.normalize();
1444+
setDate(mEndDateButton, endMillis);
1445+
setTime(mEndTimeButton, endMillis);
1446+
}
1447+
14361448
/**
14371449
* @param isChecked
14381450
*/

0 commit comments

Comments
 (0)