Fixed input field cursor issues

app/src/main/java/com/philliphsu/clock2/editalarm/NumpadTimePickerDialog.java

@@ -2,7 +2,6 @@ package com.philliphsu.clock2.editalarm;
 
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
-import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,6 +12,7 @@ import com.philliphsu.clock2.R;
 
 import butterknife.Bind;
 import butterknife.ButterKnife;
+import butterknife.OnClick;
 import butterknife.OnTouch;
 
 /**
@@ -41,6 +41,7 @@ public class NumpadTimePickerDialog extends DialogFragment implements NumpadTime
      */
     private int[] mInputtedDigits;
 
+    // Don't need to keep a reference to the dismiss ImageButton
     @Bind(R.id.input_time) EditText mInputField;
     @Bind(R.id.number_grid) NumpadTimePicker mNumpad;
 
@@ -94,16 +95,6 @@ public class NumpadTimePickerDialog extends DialogFragment implements NumpadTime
         View view = inflater.inflate(R.layout.dialog_time_picker_numpad, container, false);
         ButterKnife.bind(this, view);
 
-        Toolbar toolbar = ButterKnife.findById(view, R.id.toolbar);
-        toolbar.setNavigationIcon(android.R.drawable.ic_menu_close_clear_cancel);
-        // Can't do a method bind on the navigation icon because we don't own it
-        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                dismiss();
-            }
-        });
-
         // Can't do a method bind because the FAB is not part of this dialog's layout
         // Also can't do the bind in the Numpad's class, because it doesn't have access to
         // the OnTimeSetListener callback contained here or the dialog's dismiss()
@@ -156,6 +147,11 @@ public class NumpadTimePickerDialog extends DialogFragment implements NumpadTime
         return true;
     }
 
+    @OnClick(R.id.cancel)
+    void cancel() {
+        dismiss();
+    }
+
     private void updateInputText(String inputText) {
         mInputField.setText(inputText);
         // Move the cursor