hollorol/Clockplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement Parcelable for Alarm, snackbar undo working when deleted

Browse Source
This commit is contained in:
Phillip Hsu
2016-06-30 16:21:21 -07:00
parent 31385ad9b4
commit 5f138f2756
4 changed files with 73 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/philliphsu/clock2/editalarm/EditAlarmActivity.java
+7 -5
View File
@@ -58,7 +58,7 @@ public class EditAlarmActivity extends BaseActivity implements AlarmNumpad.KeyLi
LoaderManager.LoaderCallbacks<Alarm> {
private static final String TAG = "EditAlarmActivity";
public static final String EXTRA_ALARM_ID = "com.philliphsu.clock2.editalarm.extra.ALARM_ID";
public static final String EXTRA_ALARM_DELETED = "com.philliphsu.clock2.editalarm.extra.ALARM_DELETED";
public static final String EXTRA_DELETED_ALARM = "com.philliphsu.clock2.editalarm.extra.DELETED_ALARM";
private static final RelativeSizeSpan AMPM_SIZE_SPAN = new RelativeSizeSpan(0.5f);
private static final int REQUEST_PICK_RINGTONE = 0;
@@ -260,13 +260,15 @@ public class EditAlarmActivity extends BaseActivity implements AlarmNumpad.KeyLi
if (mOldAlarm != null) {
if (mOldAlarm.isEnabled()) {
cancelAlarm(mOldAlarm, false);
// Re-enable in case this is restored so
// the alarm is scheduled again
mOldAlarm.setEnabled(true);
}
mDatabaseManager.deleteAlarm(mOldAlarm);
Intent intent = new Intent();
intent.putExtra(EXTRA_DELETED_ALARM, mOldAlarm);
setResult(RESULT_OK, intent);
}
Intent intent = new Intent();
// TODO: Pass in the old alarm into the intent?
intent.putExtra(EXTRA_ALARM_DELETED, true);
setResult(RESULT_OK, intent);
showEditorClosed();
}