diff --git a/app/src/main/java/com/philliphsu/clock2/editalarm/GridLayoutNumpad.java b/app/src/main/java/com/philliphsu/clock2/editalarm/GridLayoutNumpad.java index 26c2a71..3e242d3 100644 --- a/app/src/main/java/com/philliphsu/clock2/editalarm/GridLayoutNumpad.java +++ b/app/src/main/java/com/philliphsu/clock2/editalarm/GridLayoutNumpad.java @@ -132,6 +132,7 @@ public abstract class GridLayoutNumpad extends GridLayout implements View.OnClic } // TODO: Why do we need this? + @Deprecated public void delete(int at) { if (at - 1 >= 0) { mInput[at - 1] = UNMODIFIED; @@ -140,10 +141,11 @@ public abstract class GridLayoutNumpad extends GridLayout implements View.OnClic } } - public final void clear() { + public final boolean clear() { Arrays.fill(mInput, UNMODIFIED); mCount = 0; onDigitsCleared(); + return true; } /** diff --git a/app/src/main/java/com/philliphsu/clock2/editalarm/NumpadTimePicker.java b/app/src/main/java/com/philliphsu/clock2/editalarm/NumpadTimePicker.java index 6d83d40..b4c1dc1 100644 --- a/app/src/main/java/com/philliphsu/clock2/editalarm/NumpadTimePicker.java +++ b/app/src/main/java/com/philliphsu/clock2/editalarm/NumpadTimePicker.java @@ -226,11 +226,7 @@ public class NumpadTimePicker extends GridLayoutNumpad implements TimePicker { } @OnClick({ R.id.leftAlt, R.id.rightAlt }) - void onClick(Button altBtn) { - onAltButtonClick(altBtn); - } - - private void onAltButtonClick(Button altBtn) { + void onAltButtonClick(Button altBtn) { if (mAltButtons[0] != altBtn && mAltButtons[1] != altBtn) throw new IllegalArgumentException("Not called with one of the alt buttons");