Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1c37b50 authored by Isaac Katzenelson's avatar Isaac Katzenelson
Browse files

Do not show time picker after alarm undo 

Bug: 7388948

When undo was selected, add alarm was called which automatically opens the time picker.
Added a flag to control this feature depending if it is a new alarm or an alarm restored from undo.

Change-Id: I1dde1f8dc893226869cbfd05596a6c7bd2eddb85
parent 99a1be6f

src/com/android/deskclock/AlarmClock.java

+7 −5
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ public class AlarmClock extends Activity implements LoaderManager.LoaderCallback 
            mUndoBar.show(new ActionableToastBar.ActionClickedListener() {

                @Override

                public void onActionClicked() {

                    asyncAddAlarm(mDeletedAlarm);

                    asyncAddAlarm(mDeletedAlarm, false);

                    mDeletedAlarm = null;

                    mUndoShowing = false;

                }
@@ -1079,7 +1079,7 @@ public class AlarmClock extends Activity implements LoaderManager.LoaderCallback 
    private void asyncAddAlarm() {

        Alarm a = new Alarm();

        a.alert = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM);

        asyncAddAlarm(a);

        asyncAddAlarm(a, true);

    }



    private void asyncDeleteAlarm(final Integer [] alarmIds) {
@@ -1112,14 +1112,14 @@ public class AlarmClock extends Activity implements LoaderManager.LoaderCallback 
        mUndoBar.show(new ActionableToastBar.ActionClickedListener() {

            @Override

            public void onActionClicked() {

                asyncAddAlarm(alarm);

                asyncAddAlarm(alarm, false);

                mDeletedAlarm = null;

                mUndoShowing = false;

            }

        }, 0, getResources().getString(R.string.alarm_deleted), true, R.string.alarm_undo, true);

    }



    private void asyncAddAlarm(final Alarm alarm) {

    private void asyncAddAlarm(final Alarm alarm, final boolean showTimePicker) {

        final AsyncTask<Void, Void, Void> updateTask = new AsyncTask<Void, Void, Void>() {

            @Override

            protected Void doInBackground(Void... aVoid) {
@@ -1140,8 +1140,10 @@ public class AlarmClock extends Activity implements LoaderManager.LoaderCallback 
                // expanded.

                View view = mAlarmsList.getChildAt(0);

                mAdapter.getView(0, view, mAlarmsList);

                if (showTimePicker) {

                    AlarmUtils.showTimeEditDialog(AlarmClock.this.getFragmentManager(), alarm);

                }

            }

        };

        updateTask.execute();

    }