Initialize NumberGridTimePickerDialog with Alarm's previous hour and minute. Expand collapsed ViewHolder when time is clicked.

app/src/main/java/com/philliphsu/clock2/alarms/AlarmsFragment.java

@@ -131,7 +131,7 @@ public class AlarmsFragment extends RecyclerViewFragment<
         // If we keep a reference to the dialog, we keep its previous state as well.
         // So the next time we call show() on it, the input field will show the
         // last inputted time.
-        BaseTimePickerDialog dialog = TimePickerHelper.newDialog(getActivity(), this);
+        BaseTimePickerDialog dialog = TimePickerHelper.newDialog(getActivity(), this, 0, 0);
         // DISREGARD THE LINT WARNING ABOUT DIALOG BEING NULL.
         dialog.show(getFragmentManager(), TAG_TIME_PICKER);
     }

app/src/main/java/com/philliphsu/clock2/alarms/BaseAlarmViewHolder.java

@@ -198,7 +198,9 @@ public abstract class BaseAlarmViewHolder extends BaseViewHolder<Alarm> {
 
     @OnClick(R.id.time)
     void openTimePicker() {
-        BaseTimePickerDialog dialog = TimePickerHelper.newDialog(getContext(), newOnTimeSetListener());
+        Alarm alarm = getAlarm();
+        BaseTimePickerDialog dialog = TimePickerHelper.newDialog(getContext(),
+                newOnTimeSetListener(), alarm.hour(), alarm.minutes());
         dialog.show(mFragmentManager, AlarmsFragment.TAG_TIME_PICKER);
     }
 

app/src/main/java/com/philliphsu/clock2/alarms/CollapsedAlarmViewHolder.java

@@ -98,4 +98,11 @@ public class CollapsedAlarmViewHolder extends BaseAlarmViewHolder {
     void openLabelEditor() {
         // DO NOT IMPLEMENT
     }
+
+    @Override
+    void openTimePicker() {
+        super.openTimePicker();
+        // Pretend we also clicked the itemView, so we get expanded.
+        onClick(itemView);
+    }
 }