From 488559086635151513688ded4e2cc8fb58492a37 Mon Sep 17 00:00:00 2001
From: Phillip Hsu <philliphsu@outlook.com>
Date: Wed, 21 Sep 2016 17:58:22 -0700
Subject: [PATCH] Moved aospdatetimepicker package contents to timepickers
 package

---
 .../philliphsu/clock2/alarms/ui/BaseAlarmViewHolder.java    | 2 +-
 .../clock2/alarms/ui/ExpandedAlarmViewHolder.java           | 2 +-
 .../com/philliphsu/clock2/list/RecyclerViewFragment.java    | 2 +-
 .../AccessibleTextView.java                                 | 2 +-
 .../com/philliphsu/clock2/timepickers/GridLayoutNumpad.java | 1 -
 .../java/com/philliphsu/clock2/timepickers/MinutesGrid.java | 1 -
 .../clock2/timepickers/NumberGridTimePickerDialog.java      | 1 -
 .../java/com/philliphsu/clock2/timepickers/NumbersGrid.java | 1 -
 .../com/philliphsu/clock2/timepickers/NumpadTimePicker.java | 1 -
 .../clock2/timepickers/NumpadTimePickerDialog.java          | 1 -
 .../philliphsu/clock2/timepickers/TwentyFourHoursGrid.java  | 1 -
 .../clock2/{aospdatetimepicker => timepickers}/Utils.java   | 2 +-
 app/src/main/res/layout/time_header_label.xml               | 6 +++---
 13 files changed, 8 insertions(+), 15 deletions(-)
 rename app/src/main/java/com/philliphsu/clock2/{aospdatetimepicker => timepickers}/AccessibleTextView.java (96%)
 rename app/src/main/java/com/philliphsu/clock2/{aospdatetimepicker => timepickers}/Utils.java (99%)

diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/ui/BaseAlarmViewHolder.java b/app/src/main/java/com/philliphsu/clock2/alarms/ui/BaseAlarmViewHolder.java
index 8c402ec..fe95cbc 100644
--- a/app/src/main/java/com/philliphsu/clock2/alarms/ui/BaseAlarmViewHolder.java
+++ b/app/src/main/java/com/philliphsu/clock2/alarms/ui/BaseAlarmViewHolder.java
@@ -25,7 +25,7 @@ import com.philliphsu.clock2.list.BaseViewHolder;
 import com.philliphsu.clock2.list.OnListItemInteractionListener;
 import com.philliphsu.clock2.R;
 import com.philliphsu.clock2.TimePickerDialogController;
-import com.philliphsu.clock2.aospdatetimepicker.Utils;
+import com.philliphsu.clock2.timepickers.Utils;
 import com.philliphsu.clock2.timepickers.BaseTimePickerDialog.OnTimeSetListener;
 import com.philliphsu.clock2.util.TimeTextUtils;
 import com.philliphsu.clock2.util.FragmentTagUtils;
diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/ui/ExpandedAlarmViewHolder.java b/app/src/main/java/com/philliphsu/clock2/alarms/ui/ExpandedAlarmViewHolder.java
index 13e379d..dad96b4 100644
--- a/app/src/main/java/com/philliphsu/clock2/alarms/ui/ExpandedAlarmViewHolder.java
+++ b/app/src/main/java/com/philliphsu/clock2/alarms/ui/ExpandedAlarmViewHolder.java
@@ -19,7 +19,7 @@ import com.philliphsu.clock2.alarms.Alarm;
 import com.philliphsu.clock2.alarms.misc.AlarmController;
 import com.philliphsu.clock2.alarms.misc.DaysOfWeek;
 import com.philliphsu.clock2.dialogs.RingtonePickerDialog;
-import com.philliphsu.clock2.aospdatetimepicker.Utils;
+import com.philliphsu.clock2.timepickers.Utils;
 import com.philliphsu.clock2.dialogs.RingtonePickerDialogController;
 import com.philliphsu.clock2.util.FragmentTagUtils;
 
diff --git a/app/src/main/java/com/philliphsu/clock2/list/RecyclerViewFragment.java b/app/src/main/java/com/philliphsu/clock2/list/RecyclerViewFragment.java
index ddbc223..40028d7 100644
--- a/app/src/main/java/com/philliphsu/clock2/list/RecyclerViewFragment.java
+++ b/app/src/main/java/com/philliphsu/clock2/list/RecyclerViewFragment.java
@@ -16,7 +16,7 @@ import android.widget.TextView;
 
 import com.philliphsu.clock2.BaseFragment;
 import com.philliphsu.clock2.R;
-import com.philliphsu.clock2.aospdatetimepicker.Utils;
+import com.philliphsu.clock2.timepickers.Utils;
 import com.philliphsu.clock2.model.BaseItemCursor;
 import com.philliphsu.clock2.model.ObjectWithId;
 
diff --git a/app/src/main/java/com/philliphsu/clock2/aospdatetimepicker/AccessibleTextView.java b/app/src/main/java/com/philliphsu/clock2/timepickers/AccessibleTextView.java
similarity index 96%
rename from app/src/main/java/com/philliphsu/clock2/aospdatetimepicker/AccessibleTextView.java
rename to app/src/main/java/com/philliphsu/clock2/timepickers/AccessibleTextView.java
index 5b29a66..924e1f8 100644
--- a/app/src/main/java/com/philliphsu/clock2/aospdatetimepicker/AccessibleTextView.java
+++ b/app/src/main/java/com/philliphsu/clock2/timepickers/AccessibleTextView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.philliphsu.clock2.aospdatetimepicker;
+package com.philliphsu.clock2.timepickers;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/app/src/main/java/com/philliphsu/clock2/timepickers/GridLayoutNumpad.java b/app/src/main/java/com/philliphsu/clock2/timepickers/GridLayoutNumpad.java
index e301ab7..19d3d90 100644
--- a/app/src/main/java/com/philliphsu/clock2/timepickers/GridLayoutNumpad.java
+++ b/app/src/main/java/com/philliphsu/clock2/timepickers/GridLayoutNumpad.java
@@ -11,7 +11,6 @@ import android.view.View;
 import android.widget.TextView;
 
 import com.philliphsu.clock2.R;
-import com.philliphsu.clock2.aospdatetimepicker.Utils;
 
 import java.util.Arrays;
 
diff --git a/app/src/main/java/com/philliphsu/clock2/timepickers/MinutesGrid.java b/app/src/main/java/com/philliphsu/clock2/timepickers/MinutesGrid.java
index e33faf3..f250aad 100644
--- a/app/src/main/java/com/philliphsu/clock2/timepickers/MinutesGrid.java
+++ b/app/src/main/java/com/philliphsu/clock2/timepickers/MinutesGrid.java
@@ -6,7 +6,6 @@ import android.view.View;
 import android.widget.ImageButton;
 
 import com.philliphsu.clock2.R;
-import com.philliphsu.clock2.aospdatetimepicker.Utils;
 
 /**
  * Created by Phillip Hsu on 8/17/2016.
diff --git a/app/src/main/java/com/philliphsu/clock2/timepickers/NumberGridTimePickerDialog.java b/app/src/main/java/com/philliphsu/clock2/timepickers/NumberGridTimePickerDialog.java
index 315b5e5..d4d121e 100644
--- a/app/src/main/java/com/philliphsu/clock2/timepickers/NumberGridTimePickerDialog.java
+++ b/app/src/main/java/com/philliphsu/clock2/timepickers/NumberGridTimePickerDialog.java
@@ -36,7 +36,6 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.philliphsu.clock2.R;
-import com.philliphsu.clock2.aospdatetimepicker.Utils;
 import com.philliphsu.clock2.timepickers.GridSelectorLayout.OnValueSelectedListener;
 
 import java.text.DateFormatSymbols;
diff --git a/app/src/main/java/com/philliphsu/clock2/timepickers/NumbersGrid.java b/app/src/main/java/com/philliphsu/clock2/timepickers/NumbersGrid.java
index dfd8c98..e576019 100644
--- a/app/src/main/java/com/philliphsu/clock2/timepickers/NumbersGrid.java
+++ b/app/src/main/java/com/philliphsu/clock2/timepickers/NumbersGrid.java
@@ -9,7 +9,6 @@ import android.view.View;
 import android.widget.TextView;
 
 import com.philliphsu.clock2.R;
-import com.philliphsu.clock2.aospdatetimepicker.Utils;
 
 /**
  * Created by Phillip Hsu on 8/17/2016.
diff --git a/app/src/main/java/com/philliphsu/clock2/timepickers/NumpadTimePicker.java b/app/src/main/java/com/philliphsu/clock2/timepickers/NumpadTimePicker.java
index abb4ed7..4f50022 100644
--- a/app/src/main/java/com/philliphsu/clock2/timepickers/NumpadTimePicker.java
+++ b/app/src/main/java/com/philliphsu/clock2/timepickers/NumpadTimePicker.java
@@ -16,7 +16,6 @@ import android.widget.ImageButton;
 import android.widget.TextView;
 
 import com.philliphsu.clock2.R;
-import com.philliphsu.clock2.aospdatetimepicker.Utils;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/app/src/main/java/com/philliphsu/clock2/timepickers/NumpadTimePickerDialog.java b/app/src/main/java/com/philliphsu/clock2/timepickers/NumpadTimePickerDialog.java
index 0eed914..5592618 100644
--- a/app/src/main/java/com/philliphsu/clock2/timepickers/NumpadTimePickerDialog.java
+++ b/app/src/main/java/com/philliphsu/clock2/timepickers/NumpadTimePickerDialog.java
@@ -8,7 +8,6 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 
 import com.philliphsu.clock2.R;
-import com.philliphsu.clock2.aospdatetimepicker.Utils;
 import com.philliphsu.clock2.util.TimeTextUtils;
 
 import butterknife.Bind;
diff --git a/app/src/main/java/com/philliphsu/clock2/timepickers/TwentyFourHoursGrid.java b/app/src/main/java/com/philliphsu/clock2/timepickers/TwentyFourHoursGrid.java
index 772b98c..b8c6662 100644
--- a/app/src/main/java/com/philliphsu/clock2/timepickers/TwentyFourHoursGrid.java
+++ b/app/src/main/java/com/philliphsu/clock2/timepickers/TwentyFourHoursGrid.java
@@ -5,7 +5,6 @@ import android.support.v4.content.ContextCompat;
 import android.view.View;
 
 import com.philliphsu.clock2.R;
-import com.philliphsu.clock2.aospdatetimepicker.Utils;
 
 /**
  * Created by Phillip Hsu on 8/17/2016.
diff --git a/app/src/main/java/com/philliphsu/clock2/aospdatetimepicker/Utils.java b/app/src/main/java/com/philliphsu/clock2/timepickers/Utils.java
similarity index 99%
rename from app/src/main/java/com/philliphsu/clock2/aospdatetimepicker/Utils.java
rename to app/src/main/java/com/philliphsu/clock2/timepickers/Utils.java
index b5c6784..96c6abb 100644
--- a/app/src/main/java/com/philliphsu/clock2/aospdatetimepicker/Utils.java
+++ b/app/src/main/java/com/philliphsu/clock2/timepickers/Utils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.philliphsu.clock2.aospdatetimepicker;
+package com.philliphsu.clock2.timepickers;
 
 import android.animation.Keyframe;
 import android.animation.ObjectAnimator;
diff --git a/app/src/main/res/layout/time_header_label.xml b/app/src/main/res/layout/time_header_label.xml
index f52ea72..1e83a11 100644
--- a/app/src/main/res/layout/time_header_label.xml
+++ b/app/src/main/res/layout/time_header_label.xml
@@ -47,7 +47,7 @@
             android:layout_marginLeft="@dimen/extra_time_label_margin"
             android:layout_marginRight="@dimen/extra_time_label_margin"
             android:layout_centerVertical="true" >
-            <com.philliphsu.clock2.aospdatetimepicker.AccessibleTextView
+            <com.philliphsu.clock2.timepickers.AccessibleTextView
                 android:id="@+id/hours"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -88,7 +88,7 @@
             android:layout_marginLeft="@dimen/extra_time_label_margin"
             android:layout_marginRight="@dimen/extra_time_label_margin"
             android:layout_centerVertical="true" >
-            <com.philliphsu.clock2.aospdatetimepicker.AccessibleTextView
+            <com.philliphsu.clock2.timepickers.AccessibleTextView
                 android:id="@+id/minutes"
                 style="@style/time_label"
                 android:layout_width="wrap_content"
@@ -97,7 +97,7 @@
                 android:text="@string/time_placeholder"
                 android:layout_gravity="center" />
         </FrameLayout>
-        <com.philliphsu.clock2.aospdatetimepicker.AccessibleTextView
+        <com.philliphsu.clock2.timepickers.AccessibleTextView
             android:id="@+id/ampm_hitspace"
             android:layout_width="@dimen/ampm_label_size"
             android:layout_height="wrap_content"