From dba5fa860fc306e35377669e83ff0939ebf8d9f3 Mon Sep 17 00:00:00 2001
From: Phillip Hsu <philliphsu@outlook.com>
Date: Wed, 21 Sep 2016 16:15:48 -0700
Subject: [PATCH] Create new dialogs package and rename editalarm package to
 timepickers

---
 .../clock2/TimePickerDialogController.java    |  7 +++---
 .../clock2/alarms/AlarmsFragment.java         |  2 +-
 .../clock2/alarms/BaseAlarmViewHolder.java    |  6 ++---
 .../alarms/ExpandedAlarmViewHolder.java       |  4 ++--
 .../clock2/{ => dialogs}/AddLabelDialog.java  |  4 +++-
 .../AddLabelDialogController.java             |  2 +-
 .../BaseAlertDialogFragment.java              |  2 +-
 .../DialogFragmentController.java             |  2 +-
 .../{ => dialogs}/RingtonePickerDialog.java   |  3 ++-
 .../RingtonePickerDialogController.java       |  6 ++---
 .../clock2/edittimer/EditTimerActivity.java   |  4 ++--
 .../settings/ThemedRingtonePreference.java    |  3 ++-
 .../BaseTimePickerDialog.java                 |  2 +-
 .../GridLayoutNumpad.java                     |  2 +-
 .../GridSelectorLayout.java                   |  2 +-
 .../{editalarm => timepickers}/HoursGrid.java |  2 +-
 .../MinutesGrid.java                          |  2 +-
 .../NumberGridTimePickerDialog.java           |  4 ++--
 .../NumbersGrid.java                          |  2 +-
 .../NumpadTimePicker.java                     |  2 +-
 .../NumpadTimePickerDialog.java               |  2 +-
 .../TwentyFourHourGridItem.java               |  2 +-
 .../TwentyFourHoursGrid.java                  |  2 +-
 .../clock2/timers/TimerViewHolder.java        |  4 ++--
 .../dialog_time_picker_number_grid.xml        |  2 +-
 .../layout-land/dialog_time_picker_numpad.xml |  2 +-
 .../res/layout/content_24h_number_grid.xml    | 24 +++++++++----------
 .../layout/dialog_time_picker_number_grid.xml |  2 +-
 .../res/layout/dialog_time_picker_numpad.xml  |  2 +-
 29 files changed, 55 insertions(+), 50 deletions(-)
 rename app/src/main/java/com/philliphsu/clock2/{ => dialogs}/AddLabelDialog.java (97%)
 rename app/src/main/java/com/philliphsu/clock2/{ => dialogs}/AddLabelDialogController.java (96%)
 rename app/src/main/java/com/philliphsu/clock2/{ => dialogs}/BaseAlertDialogFragment.java (97%)
 rename app/src/main/java/com/philliphsu/clock2/{ => dialogs}/DialogFragmentController.java (97%)
 rename app/src/main/java/com/philliphsu/clock2/{ => dialogs}/RingtonePickerDialog.java (98%)
 rename app/src/main/java/com/philliphsu/clock2/{settings => dialogs}/RingtonePickerDialogController.java (86%)
 rename app/src/main/java/com/philliphsu/clock2/{editalarm => timepickers}/BaseTimePickerDialog.java (99%)
 rename app/src/main/java/com/philliphsu/clock2/{editalarm => timepickers}/GridLayoutNumpad.java (99%)
 rename app/src/main/java/com/philliphsu/clock2/{editalarm => timepickers}/GridSelectorLayout.java (99%)
 rename app/src/main/java/com/philliphsu/clock2/{editalarm => timepickers}/HoursGrid.java (94%)
 rename app/src/main/java/com/philliphsu/clock2/{editalarm => timepickers}/MinutesGrid.java (98%)
 rename app/src/main/java/com/philliphsu/clock2/{editalarm => timepickers}/NumberGridTimePickerDialog.java (99%)
 rename app/src/main/java/com/philliphsu/clock2/{editalarm => timepickers}/NumbersGrid.java (99%)
 rename app/src/main/java/com/philliphsu/clock2/{editalarm => timepickers}/NumpadTimePicker.java (99%)
 rename app/src/main/java/com/philliphsu/clock2/{editalarm => timepickers}/NumpadTimePickerDialog.java (99%)
 rename app/src/main/java/com/philliphsu/clock2/{editalarm => timepickers}/TwentyFourHourGridItem.java (98%)
 rename app/src/main/java/com/philliphsu/clock2/{editalarm => timepickers}/TwentyFourHoursGrid.java (98%)

diff --git a/app/src/main/java/com/philliphsu/clock2/TimePickerDialogController.java b/app/src/main/java/com/philliphsu/clock2/TimePickerDialogController.java
index 283dc79..b253093 100644
--- a/app/src/main/java/com/philliphsu/clock2/TimePickerDialogController.java
+++ b/app/src/main/java/com/philliphsu/clock2/TimePickerDialogController.java
@@ -6,9 +6,10 @@ import android.support.v4.app.FragmentManager;
 import android.text.format.DateFormat;
 import android.util.Log;
 
-import com.philliphsu.clock2.editalarm.BaseTimePickerDialog;
-import com.philliphsu.clock2.editalarm.NumberGridTimePickerDialog;
-import com.philliphsu.clock2.editalarm.NumpadTimePickerDialog;
+import com.philliphsu.clock2.dialogs.DialogFragmentController;
+import com.philliphsu.clock2.timepickers.BaseTimePickerDialog;
+import com.philliphsu.clock2.timepickers.NumberGridTimePickerDialog;
+import com.philliphsu.clock2.timepickers.NumpadTimePickerDialog;
 
 /**
  * Created by Phillip Hsu on 9/6/2016.
diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/AlarmsFragment.java b/app/src/main/java/com/philliphsu/clock2/alarms/AlarmsFragment.java
index 26795d3..e0f80c3 100644
--- a/app/src/main/java/com/philliphsu/clock2/alarms/AlarmsFragment.java
+++ b/app/src/main/java/com/philliphsu/clock2/alarms/AlarmsFragment.java
@@ -19,7 +19,7 @@ import com.philliphsu.clock2.AsyncAlarmsTableUpdateHandler;
 import com.philliphsu.clock2.R;
 import com.philliphsu.clock2.RecyclerViewFragment;
 import com.philliphsu.clock2.TimePickerDialogController;
-import com.philliphsu.clock2.editalarm.BaseTimePickerDialog;
+import com.philliphsu.clock2.timepickers.BaseTimePickerDialog;
 import com.philliphsu.clock2.model.AlarmCursor;
 import com.philliphsu.clock2.model.AlarmsListCursorLoader;
 import com.philliphsu.clock2.util.AlarmController;
diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/BaseAlarmViewHolder.java b/app/src/main/java/com/philliphsu/clock2/alarms/BaseAlarmViewHolder.java
index 9acc4b5..8433299 100644
--- a/app/src/main/java/com/philliphsu/clock2/alarms/BaseAlarmViewHolder.java
+++ b/app/src/main/java/com/philliphsu/clock2/alarms/BaseAlarmViewHolder.java
@@ -16,15 +16,15 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.philliphsu.clock2.AddLabelDialog;
-import com.philliphsu.clock2.AddLabelDialogController;
+import com.philliphsu.clock2.dialogs.AddLabelDialog;
+import com.philliphsu.clock2.dialogs.AddLabelDialogController;
 import com.philliphsu.clock2.Alarm;
 import com.philliphsu.clock2.BaseViewHolder;
 import com.philliphsu.clock2.OnListItemInteractionListener;
 import com.philliphsu.clock2.R;
 import com.philliphsu.clock2.TimePickerDialogController;
 import com.philliphsu.clock2.aospdatetimepicker.Utils;
-import com.philliphsu.clock2.editalarm.BaseTimePickerDialog.OnTimeSetListener;
+import com.philliphsu.clock2.timepickers.BaseTimePickerDialog.OnTimeSetListener;
 import com.philliphsu.clock2.util.TimeTextUtils;
 import com.philliphsu.clock2.util.AlarmController;
 import com.philliphsu.clock2.util.AlarmUtils;
diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/ExpandedAlarmViewHolder.java b/app/src/main/java/com/philliphsu/clock2/alarms/ExpandedAlarmViewHolder.java
index a847662..cf738bf 100644
--- a/app/src/main/java/com/philliphsu/clock2/alarms/ExpandedAlarmViewHolder.java
+++ b/app/src/main/java/com/philliphsu/clock2/alarms/ExpandedAlarmViewHolder.java
@@ -17,9 +17,9 @@ import com.philliphsu.clock2.Alarm;
 import com.philliphsu.clock2.DaysOfWeek;
 import com.philliphsu.clock2.OnListItemInteractionListener;
 import com.philliphsu.clock2.R;
-import com.philliphsu.clock2.RingtonePickerDialog;
+import com.philliphsu.clock2.dialogs.RingtonePickerDialog;
 import com.philliphsu.clock2.aospdatetimepicker.Utils;
-import com.philliphsu.clock2.settings.RingtonePickerDialogController;
+import com.philliphsu.clock2.dialogs.RingtonePickerDialogController;
 import com.philliphsu.clock2.util.AlarmController;
 import com.philliphsu.clock2.util.FragmentTagUtils;
 
diff --git a/app/src/main/java/com/philliphsu/clock2/AddLabelDialog.java b/app/src/main/java/com/philliphsu/clock2/dialogs/AddLabelDialog.java
similarity index 97%
rename from app/src/main/java/com/philliphsu/clock2/AddLabelDialog.java
rename to app/src/main/java/com/philliphsu/clock2/dialogs/AddLabelDialog.java
index f04f77e..1ee5124 100644
--- a/app/src/main/java/com/philliphsu/clock2/AddLabelDialog.java
+++ b/app/src/main/java/com/philliphsu/clock2/dialogs/AddLabelDialog.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2;
+package com.philliphsu.clock2.dialogs;
 
 import android.content.DialogInterface;
 import android.support.v7.app.AlertDialog;
@@ -6,6 +6,8 @@ import android.support.v7.widget.AppCompatEditText;
 import android.view.inputmethod.EditorInfo;
 import android.widget.EditText;
 
+import com.philliphsu.clock2.R;
+
 import static com.philliphsu.clock2.util.KeyboardUtils.showKeyboard;
 
 /**
diff --git a/app/src/main/java/com/philliphsu/clock2/AddLabelDialogController.java b/app/src/main/java/com/philliphsu/clock2/dialogs/AddLabelDialogController.java
similarity index 96%
rename from app/src/main/java/com/philliphsu/clock2/AddLabelDialogController.java
rename to app/src/main/java/com/philliphsu/clock2/dialogs/AddLabelDialogController.java
index a29fd58..65e72d2 100644
--- a/app/src/main/java/com/philliphsu/clock2/AddLabelDialogController.java
+++ b/app/src/main/java/com/philliphsu/clock2/dialogs/AddLabelDialogController.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2;
+package com.philliphsu.clock2.dialogs;
 
 import android.support.v4.app.FragmentManager;
 import android.util.Log;
diff --git a/app/src/main/java/com/philliphsu/clock2/BaseAlertDialogFragment.java b/app/src/main/java/com/philliphsu/clock2/dialogs/BaseAlertDialogFragment.java
similarity index 97%
rename from app/src/main/java/com/philliphsu/clock2/BaseAlertDialogFragment.java
rename to app/src/main/java/com/philliphsu/clock2/dialogs/BaseAlertDialogFragment.java
index cc6068d..c2fedf1 100644
--- a/app/src/main/java/com/philliphsu/clock2/BaseAlertDialogFragment.java
+++ b/app/src/main/java/com/philliphsu/clock2/dialogs/BaseAlertDialogFragment.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2;
+package com.philliphsu.clock2.dialogs;
 
 import android.app.Dialog;
 import android.content.DialogInterface;
diff --git a/app/src/main/java/com/philliphsu/clock2/DialogFragmentController.java b/app/src/main/java/com/philliphsu/clock2/dialogs/DialogFragmentController.java
similarity index 97%
rename from app/src/main/java/com/philliphsu/clock2/DialogFragmentController.java
rename to app/src/main/java/com/philliphsu/clock2/dialogs/DialogFragmentController.java
index 5b77331..d0f3b61 100644
--- a/app/src/main/java/com/philliphsu/clock2/DialogFragmentController.java
+++ b/app/src/main/java/com/philliphsu/clock2/dialogs/DialogFragmentController.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2;
+package com.philliphsu.clock2.dialogs;
 
 import android.support.annotation.Nullable;
 import android.support.v4.app.DialogFragment;
diff --git a/app/src/main/java/com/philliphsu/clock2/RingtonePickerDialog.java b/app/src/main/java/com/philliphsu/clock2/dialogs/RingtonePickerDialog.java
similarity index 98%
rename from app/src/main/java/com/philliphsu/clock2/RingtonePickerDialog.java
rename to app/src/main/java/com/philliphsu/clock2/dialogs/RingtonePickerDialog.java
index fd5e972..ee7388e 100644
--- a/app/src/main/java/com/philliphsu/clock2/RingtonePickerDialog.java
+++ b/app/src/main/java/com/philliphsu/clock2/dialogs/RingtonePickerDialog.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2;
+package com.philliphsu.clock2.dialogs;
 
 import android.content.DialogInterface;
 import android.database.Cursor;
@@ -8,6 +8,7 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AlertDialog;
 
+import com.philliphsu.clock2.R;
 import com.philliphsu.clock2.ringtone.RingtoneLoop;
 
 /**
diff --git a/app/src/main/java/com/philliphsu/clock2/settings/RingtonePickerDialogController.java b/app/src/main/java/com/philliphsu/clock2/dialogs/RingtonePickerDialogController.java
similarity index 86%
rename from app/src/main/java/com/philliphsu/clock2/settings/RingtonePickerDialogController.java
rename to app/src/main/java/com/philliphsu/clock2/dialogs/RingtonePickerDialogController.java
index c03ce40..e868013 100644
--- a/app/src/main/java/com/philliphsu/clock2/settings/RingtonePickerDialogController.java
+++ b/app/src/main/java/com/philliphsu/clock2/dialogs/RingtonePickerDialogController.java
@@ -1,11 +1,11 @@
-package com.philliphsu.clock2.settings;
+package com.philliphsu.clock2.dialogs;
 
 import android.net.Uri;
 import android.support.v4.app.FragmentManager;
 import android.util.Log;
 
-import com.philliphsu.clock2.DialogFragmentController;
-import com.philliphsu.clock2.RingtonePickerDialog;
+import com.philliphsu.clock2.dialogs.DialogFragmentController;
+import com.philliphsu.clock2.dialogs.RingtonePickerDialog;
 
 /**
  * Created by Phillip Hsu on 9/20/2016.
diff --git a/app/src/main/java/com/philliphsu/clock2/edittimer/EditTimerActivity.java b/app/src/main/java/com/philliphsu/clock2/edittimer/EditTimerActivity.java
index 661836c..2263ad4 100644
--- a/app/src/main/java/com/philliphsu/clock2/edittimer/EditTimerActivity.java
+++ b/app/src/main/java/com/philliphsu/clock2/edittimer/EditTimerActivity.java
@@ -12,8 +12,8 @@ import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import com.philliphsu.clock2.AddLabelDialog;
-import com.philliphsu.clock2.AddLabelDialogController;
+import com.philliphsu.clock2.dialogs.AddLabelDialog;
+import com.philliphsu.clock2.dialogs.AddLabelDialogController;
 import com.philliphsu.clock2.BaseActivity;
 import com.philliphsu.clock2.R;
 import com.philliphsu.clock2.util.FragmentTagUtils;
diff --git a/app/src/main/java/com/philliphsu/clock2/settings/ThemedRingtonePreference.java b/app/src/main/java/com/philliphsu/clock2/settings/ThemedRingtonePreference.java
index d971668..b00ad5e 100644
--- a/app/src/main/java/com/philliphsu/clock2/settings/ThemedRingtonePreference.java
+++ b/app/src/main/java/com/philliphsu/clock2/settings/ThemedRingtonePreference.java
@@ -11,7 +11,8 @@ import android.provider.Settings;
 import android.support.v7.app.AppCompatActivity;
 import android.util.AttributeSet;
 
-import com.philliphsu.clock2.RingtonePickerDialog;
+import com.philliphsu.clock2.dialogs.RingtonePickerDialog;
+import com.philliphsu.clock2.dialogs.RingtonePickerDialogController;
 
 /**
  * Created by Phillip Hsu on 9/20/2016.
diff --git a/app/src/main/java/com/philliphsu/clock2/editalarm/BaseTimePickerDialog.java b/app/src/main/java/com/philliphsu/clock2/timepickers/BaseTimePickerDialog.java
similarity index 99%
rename from app/src/main/java/com/philliphsu/clock2/editalarm/BaseTimePickerDialog.java
rename to app/src/main/java/com/philliphsu/clock2/timepickers/BaseTimePickerDialog.java
index 806e478..054923b 100644
--- a/app/src/main/java/com/philliphsu/clock2/editalarm/BaseTimePickerDialog.java
+++ b/app/src/main/java/com/philliphsu/clock2/timepickers/BaseTimePickerDialog.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.editalarm;
+package com.philliphsu.clock2.timepickers;
 
 import android.os.Bundle;
 import android.support.annotation.LayoutRes;
diff --git a/app/src/main/java/com/philliphsu/clock2/editalarm/GridLayoutNumpad.java b/app/src/main/java/com/philliphsu/clock2/timepickers/GridLayoutNumpad.java
similarity index 99%
rename from app/src/main/java/com/philliphsu/clock2/editalarm/GridLayoutNumpad.java
rename to app/src/main/java/com/philliphsu/clock2/timepickers/GridLayoutNumpad.java
index 55e330c..e301ab7 100644
--- a/app/src/main/java/com/philliphsu/clock2/editalarm/GridLayoutNumpad.java
+++ b/app/src/main/java/com/philliphsu/clock2/timepickers/GridLayoutNumpad.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.editalarm;
+package com.philliphsu.clock2.timepickers;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
diff --git a/app/src/main/java/com/philliphsu/clock2/editalarm/GridSelectorLayout.java b/app/src/main/java/com/philliphsu/clock2/timepickers/GridSelectorLayout.java
similarity index 99%
rename from app/src/main/java/com/philliphsu/clock2/editalarm/GridSelectorLayout.java
rename to app/src/main/java/com/philliphsu/clock2/timepickers/GridSelectorLayout.java
index e56423a..55d0773 100644
--- a/app/src/main/java/com/philliphsu/clock2/editalarm/GridSelectorLayout.java
+++ b/app/src/main/java/com/philliphsu/clock2/timepickers/GridSelectorLayout.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.philliphsu.clock2.editalarm;
+package com.philliphsu.clock2.timepickers;
 
 import android.content.Context;
 import android.os.Handler;
diff --git a/app/src/main/java/com/philliphsu/clock2/editalarm/HoursGrid.java b/app/src/main/java/com/philliphsu/clock2/timepickers/HoursGrid.java
similarity index 94%
rename from app/src/main/java/com/philliphsu/clock2/editalarm/HoursGrid.java
rename to app/src/main/java/com/philliphsu/clock2/timepickers/HoursGrid.java
index db01f1c..bb26ae4 100644
--- a/app/src/main/java/com/philliphsu/clock2/editalarm/HoursGrid.java
+++ b/app/src/main/java/com/philliphsu/clock2/timepickers/HoursGrid.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.editalarm;
+package com.philliphsu.clock2.timepickers;
 
 import android.content.Context;
 
diff --git a/app/src/main/java/com/philliphsu/clock2/editalarm/MinutesGrid.java b/app/src/main/java/com/philliphsu/clock2/timepickers/MinutesGrid.java
similarity index 98%
rename from app/src/main/java/com/philliphsu/clock2/editalarm/MinutesGrid.java
rename to app/src/main/java/com/philliphsu/clock2/timepickers/MinutesGrid.java
index b08fe08..e33faf3 100644
--- a/app/src/main/java/com/philliphsu/clock2/editalarm/MinutesGrid.java
+++ b/app/src/main/java/com/philliphsu/clock2/timepickers/MinutesGrid.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.editalarm;
+package com.philliphsu.clock2.timepickers;
 
 import android.content.Context;
 import android.support.v4.content.ContextCompat;
diff --git a/app/src/main/java/com/philliphsu/clock2/editalarm/NumberGridTimePickerDialog.java b/app/src/main/java/com/philliphsu/clock2/timepickers/NumberGridTimePickerDialog.java
similarity index 99%
rename from app/src/main/java/com/philliphsu/clock2/editalarm/NumberGridTimePickerDialog.java
rename to app/src/main/java/com/philliphsu/clock2/timepickers/NumberGridTimePickerDialog.java
index 7777e4d..315b5e5 100644
--- a/app/src/main/java/com/philliphsu/clock2/editalarm/NumberGridTimePickerDialog.java
+++ b/app/src/main/java/com/philliphsu/clock2/timepickers/NumberGridTimePickerDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.philliphsu.clock2.editalarm;
+package com.philliphsu.clock2.timepickers;
 
 import android.animation.ObjectAnimator;
 import android.app.ActionBar.LayoutParams;
@@ -37,7 +37,7 @@ import android.widget.TextView;
 
 import com.philliphsu.clock2.R;
 import com.philliphsu.clock2.aospdatetimepicker.Utils;
-import com.philliphsu.clock2.editalarm.GridSelectorLayout.OnValueSelectedListener;
+import com.philliphsu.clock2.timepickers.GridSelectorLayout.OnValueSelectedListener;
 
 import java.text.DateFormatSymbols;
 import java.util.ArrayList;
diff --git a/app/src/main/java/com/philliphsu/clock2/editalarm/NumbersGrid.java b/app/src/main/java/com/philliphsu/clock2/timepickers/NumbersGrid.java
similarity index 99%
rename from app/src/main/java/com/philliphsu/clock2/editalarm/NumbersGrid.java
rename to app/src/main/java/com/philliphsu/clock2/timepickers/NumbersGrid.java
index e0c9d60..dfd8c98 100644
--- a/app/src/main/java/com/philliphsu/clock2/editalarm/NumbersGrid.java
+++ b/app/src/main/java/com/philliphsu/clock2/timepickers/NumbersGrid.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.editalarm;
+package com.philliphsu.clock2.timepickers;
 
 import android.content.Context;
 import android.support.annotation.LayoutRes;
diff --git a/app/src/main/java/com/philliphsu/clock2/editalarm/NumpadTimePicker.java b/app/src/main/java/com/philliphsu/clock2/timepickers/NumpadTimePicker.java
similarity index 99%
rename from app/src/main/java/com/philliphsu/clock2/editalarm/NumpadTimePicker.java
rename to app/src/main/java/com/philliphsu/clock2/timepickers/NumpadTimePicker.java
index 9e14bdb..abb4ed7 100644
--- a/app/src/main/java/com/philliphsu/clock2/editalarm/NumpadTimePicker.java
+++ b/app/src/main/java/com/philliphsu/clock2/timepickers/NumpadTimePicker.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.editalarm;
+package com.philliphsu.clock2.timepickers;
 
 import android.animation.ObjectAnimator;
 import android.content.Context;
diff --git a/app/src/main/java/com/philliphsu/clock2/editalarm/NumpadTimePickerDialog.java b/app/src/main/java/com/philliphsu/clock2/timepickers/NumpadTimePickerDialog.java
similarity index 99%
rename from app/src/main/java/com/philliphsu/clock2/editalarm/NumpadTimePickerDialog.java
rename to app/src/main/java/com/philliphsu/clock2/timepickers/NumpadTimePickerDialog.java
index ad56aa8..0eed914 100644
--- a/app/src/main/java/com/philliphsu/clock2/editalarm/NumpadTimePickerDialog.java
+++ b/app/src/main/java/com/philliphsu/clock2/timepickers/NumpadTimePickerDialog.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.editalarm;
+package com.philliphsu.clock2.timepickers;
 
 import android.os.Bundle;
 import android.support.v4.content.ContextCompat;
diff --git a/app/src/main/java/com/philliphsu/clock2/editalarm/TwentyFourHourGridItem.java b/app/src/main/java/com/philliphsu/clock2/timepickers/TwentyFourHourGridItem.java
similarity index 98%
rename from app/src/main/java/com/philliphsu/clock2/editalarm/TwentyFourHourGridItem.java
rename to app/src/main/java/com/philliphsu/clock2/timepickers/TwentyFourHourGridItem.java
index 705b82a..fbda212 100644
--- a/app/src/main/java/com/philliphsu/clock2/editalarm/TwentyFourHourGridItem.java
+++ b/app/src/main/java/com/philliphsu/clock2/timepickers/TwentyFourHourGridItem.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.editalarm;
+package com.philliphsu.clock2.timepickers;
 
 import android.content.Context;
 import android.content.res.Configuration;
diff --git a/app/src/main/java/com/philliphsu/clock2/editalarm/TwentyFourHoursGrid.java b/app/src/main/java/com/philliphsu/clock2/timepickers/TwentyFourHoursGrid.java
similarity index 98%
rename from app/src/main/java/com/philliphsu/clock2/editalarm/TwentyFourHoursGrid.java
rename to app/src/main/java/com/philliphsu/clock2/timepickers/TwentyFourHoursGrid.java
index 25c2418..772b98c 100644
--- a/app/src/main/java/com/philliphsu/clock2/editalarm/TwentyFourHoursGrid.java
+++ b/app/src/main/java/com/philliphsu/clock2/timepickers/TwentyFourHoursGrid.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.editalarm;
+package com.philliphsu.clock2.timepickers;
 
 import android.content.Context;
 import android.support.v4.content.ContextCompat;
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimerViewHolder.java b/app/src/main/java/com/philliphsu/clock2/timers/TimerViewHolder.java
index d78b070..540fe21 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/TimerViewHolder.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/TimerViewHolder.java
@@ -15,8 +15,8 @@ import android.widget.ImageButton;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import com.philliphsu.clock2.AddLabelDialog;
-import com.philliphsu.clock2.AddLabelDialogController;
+import com.philliphsu.clock2.dialogs.AddLabelDialog;
+import com.philliphsu.clock2.dialogs.AddLabelDialogController;
 import com.philliphsu.clock2.AsyncTimersTableUpdateHandler;
 import com.philliphsu.clock2.BaseViewHolder;
 import com.philliphsu.clock2.OnListItemInteractionListener;
diff --git a/app/src/main/res/layout-land/dialog_time_picker_number_grid.xml b/app/src/main/res/layout-land/dialog_time_picker_number_grid.xml
index 6cee668..4204a75 100644
--- a/app/src/main/res/layout-land/dialog_time_picker_number_grid.xml
+++ b/app/src/main/res/layout-land/dialog_time_picker_number_grid.xml
@@ -22,7 +22,7 @@
                 android:layout_gravity="center" />
         </FrameLayout>
 
-        <com.philliphsu.clock2.editalarm.GridSelectorLayout
+        <com.philliphsu.clock2.timepickers.GridSelectorLayout
             android:id="@+id/time_picker"
             android:layout_width="0dp"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout-land/dialog_time_picker_numpad.xml b/app/src/main/res/layout-land/dialog_time_picker_numpad.xml
index 11d25a6..811ebb4 100644
--- a/app/src/main/res/layout-land/dialog_time_picker_numpad.xml
+++ b/app/src/main/res/layout-land/dialog_time_picker_numpad.xml
@@ -20,7 +20,7 @@ doesn't work. -->
     <!--<View style="@style/FocusGrabber"
           android:id="@+id/focus_grabber"/>-->
 
-    <com.philliphsu.clock2.editalarm.NumpadTimePicker
+    <com.philliphsu.clock2.timepickers.NumpadTimePicker
         android:id="@+id/number_grid"
         android:layout_width="0dp"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/content_24h_number_grid.xml b/app/src/main/res/layout/content_24h_number_grid.xml
index 3800f4f..f76ff77 100644
--- a/app/src/main/res/layout/content_24h_number_grid.xml
+++ b/app/src/main/res/layout/content_24h_number_grid.xml
@@ -2,51 +2,51 @@
 <merge xmlns:app="http://schemas.android.com/apk/res-auto">
     <!-- Although the style defines a textSize attribute, it will not be
     applied because this is just a LinearLayout. -->
-    <com.philliphsu.clock2.editalarm.TwentyFourHourGridItem
+    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
         style="@style/NumberGridButton.Hour"
         app:primaryText="00"
         app:secondaryText="12"/>
-    <com.philliphsu.clock2.editalarm.TwentyFourHourGridItem
+    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
         style="@style/NumberGridButton.Hour"
         app:primaryText="01"
         app:secondaryText="13"/>
-    <com.philliphsu.clock2.editalarm.TwentyFourHourGridItem
+    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
         style="@style/NumberGridButton.Hour"
         app:primaryText="02"
         app:secondaryText="14"/>
-    <com.philliphsu.clock2.editalarm.TwentyFourHourGridItem
+    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
         style="@style/NumberGridButton.Hour"
         app:primaryText="03"
         app:secondaryText="15"/>
-    <com.philliphsu.clock2.editalarm.TwentyFourHourGridItem
+    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
         style="@style/NumberGridButton.Hour"
         app:primaryText="04"
         app:secondaryText="16"/>
-    <com.philliphsu.clock2.editalarm.TwentyFourHourGridItem
+    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
         style="@style/NumberGridButton.Hour"
         app:primaryText="05"
         app:secondaryText="17"/>
-    <com.philliphsu.clock2.editalarm.TwentyFourHourGridItem
+    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
         style="@style/NumberGridButton.Hour"
         app:primaryText="06"
         app:secondaryText="18"/>
-    <com.philliphsu.clock2.editalarm.TwentyFourHourGridItem
+    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
         style="@style/NumberGridButton.Hour"
         app:primaryText="07"
         app:secondaryText="19"/>
-    <com.philliphsu.clock2.editalarm.TwentyFourHourGridItem
+    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
         style="@style/NumberGridButton.Hour"
         app:primaryText="08"
         app:secondaryText="20"/>
-    <com.philliphsu.clock2.editalarm.TwentyFourHourGridItem
+    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
         style="@style/NumberGridButton.Hour"
         app:primaryText="09"
         app:secondaryText="21"/>
-    <com.philliphsu.clock2.editalarm.TwentyFourHourGridItem
+    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
         style="@style/NumberGridButton.Hour"
         app:primaryText="10"
         app:secondaryText="22"/>
-    <com.philliphsu.clock2.editalarm.TwentyFourHourGridItem
+    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
         style="@style/NumberGridButton.Hour"
         app:primaryText="11"
         app:secondaryText="23"/>
diff --git a/app/src/main/res/layout/dialog_time_picker_number_grid.xml b/app/src/main/res/layout/dialog_time_picker_number_grid.xml
index 33e2a69..566fbc3 100644
--- a/app/src/main/res/layout/dialog_time_picker_number_grid.xml
+++ b/app/src/main/res/layout/dialog_time_picker_number_grid.xml
@@ -27,7 +27,7 @@
         <!--TOneverDO: Change paddingBottom to marginBottom without also subtracting the
          margin amount from the height. -->
         <!--TODO: As a library, we probably also want to paddingLeft/Right-->
-        <com.philliphsu.clock2.editalarm.GridSelectorLayout
+        <com.philliphsu.clock2.timepickers.GridSelectorLayout
             android:id="@+id/time_picker"
             android:layout_width="match_parent"
             android:layout_height="@dimen/number_grid_height"
diff --git a/app/src/main/res/layout/dialog_time_picker_numpad.xml b/app/src/main/res/layout/dialog_time_picker_numpad.xml
index 6b42c17..1027e99 100644
--- a/app/src/main/res/layout/dialog_time_picker_numpad.xml
+++ b/app/src/main/res/layout/dialog_time_picker_numpad.xml
@@ -20,7 +20,7 @@ doesn't work. -->
     <!--<View style="@style/FocusGrabber"
           android:id="@+id/focus_grabber"/>-->
 
-    <com.philliphsu.clock2.editalarm.NumpadTimePicker
+    <com.philliphsu.clock2.timepickers.NumpadTimePicker
         android:id="@+id/number_grid"
         android:layout_width="match_parent"
         android:layout_height="@dimen/numeric_keypad_height"