From bdd16fb77ac6ae653e78885190348915072b0a2b Mon Sep 17 00:00:00 2001
From: Ugonna <mail@ugonna.co>
Date: Mon, 17 Nov 2014 22:40:40 -0500
Subject: [PATCH 01/11] Changes layout of date-picker "done" button

- Removes divider
- Uses an "OK/Cancel" paradigm as suggested by guidelines for picker dialogs
- Changes padding and other layout metrics to match guidelines
- Changes "OK/Cancel" font style and color to match dialog guidelines
---
 .../res/layout-land/date_picker_dialog.xml    |  1 -
 .../date_picker_dialog.xml                    |  1 -
 .../res/layout-sw600dp/date_picker_dialog.xml |  1 -
 .../date_picker_dialog.xml                    |  1 -
 .../res/layout/date_picker_dialog.xml         |  1 -
 .../res/layout/date_picker_done_button.xml    | 25 +++++++++++++++----
 .../res/values-v14/styles.xml                 | 12 +++++++++
 datetimepicker-library/res/values/colors.xml  |  2 +-
 datetimepicker-library/res/values/dimens.xml  |  3 +++
 datetimepicker-library/res/values/ids.xml     |  1 +
 datetimepicker-library/res/values/strings.xml |  3 ++-
 datetimepicker-library/res/values/styles.xml  | 12 +++++++++
 12 files changed, 51 insertions(+), 12 deletions(-)
 create mode 100644 datetimepicker-library/res/values-v14/styles.xml

diff --git a/datetimepicker-library/res/layout-land/date_picker_dialog.xml b/datetimepicker-library/res/layout-land/date_picker_dialog.xml
index 09a1a67..96cd4a2 100644
--- a/datetimepicker-library/res/layout-land/date_picker_dialog.xml
+++ b/datetimepicker-library/res/layout-land/date_picker_dialog.xml
@@ -6,7 +6,6 @@
             <include layout="@layout/date_picker_header_view" />
             <include layout="@layout/date_picker_selected_date" />
         </LinearLayout>
-        <View android:background="@color/line_background" android:layout_width="fill_parent" android:layout_height="1.0dip" />
         <include layout="@layout/date_picker_done_button" />
     </LinearLayout>
     <include layout="@layout/date_picker_view_animator" />
diff --git a/datetimepicker-library/res/layout-sw600dp-land/date_picker_dialog.xml b/datetimepicker-library/res/layout-sw600dp-land/date_picker_dialog.xml
index 09a1a67..96cd4a2 100644
--- a/datetimepicker-library/res/layout-sw600dp-land/date_picker_dialog.xml
+++ b/datetimepicker-library/res/layout-sw600dp-land/date_picker_dialog.xml
@@ -6,7 +6,6 @@
             <include layout="@layout/date_picker_header_view" />
             <include layout="@layout/date_picker_selected_date" />
         </LinearLayout>
-        <View android:background="@color/line_background" android:layout_width="fill_parent" android:layout_height="1.0dip" />
         <include layout="@layout/date_picker_done_button" />
     </LinearLayout>
     <include layout="@layout/date_picker_view_animator" />
diff --git a/datetimepicker-library/res/layout-sw600dp/date_picker_dialog.xml b/datetimepicker-library/res/layout-sw600dp/date_picker_dialog.xml
index a44ada9..b490fcb 100644
--- a/datetimepicker-library/res/layout-sw600dp/date_picker_dialog.xml
+++ b/datetimepicker-library/res/layout-sw600dp/date_picker_dialog.xml
@@ -6,6 +6,5 @@
         <include layout="@layout/date_picker_selected_date" />
     </LinearLayout>
     <include layout="@layout/date_picker_view_animator" />
-    <View android:background="@color/line_background" android:layout_width="fill_parent" android:layout_height="1.0dip" />
     <include layout="@layout/date_picker_done_button" />
 </LinearLayout>
\ No newline at end of file
diff --git a/datetimepicker-library/res/layout-w270dp-h560dp/date_picker_dialog.xml b/datetimepicker-library/res/layout-w270dp-h560dp/date_picker_dialog.xml
index a44ada9..b490fcb 100644
--- a/datetimepicker-library/res/layout-w270dp-h560dp/date_picker_dialog.xml
+++ b/datetimepicker-library/res/layout-w270dp-h560dp/date_picker_dialog.xml
@@ -6,6 +6,5 @@
         <include layout="@layout/date_picker_selected_date" />
     </LinearLayout>
     <include layout="@layout/date_picker_view_animator" />
-    <View android:background="@color/line_background" android:layout_width="fill_parent" android:layout_height="1.0dip" />
     <include layout="@layout/date_picker_done_button" />
 </LinearLayout>
\ No newline at end of file
diff --git a/datetimepicker-library/res/layout/date_picker_dialog.xml b/datetimepicker-library/res/layout/date_picker_dialog.xml
index 0c00283..f813907 100644
--- a/datetimepicker-library/res/layout/date_picker_dialog.xml
+++ b/datetimepicker-library/res/layout/date_picker_dialog.xml
@@ -5,6 +5,5 @@
         <include layout="@layout/date_picker_selected_date" />
     </LinearLayout>
     <include layout="@layout/date_picker_view_animator" />
-    <View android:background="@color/line_background" android:layout_width="@dimen/date_picker_component_width" android:layout_height="1.0dip" />
     <include layout="@layout/date_picker_done_button" />
 </LinearLayout>
\ No newline at end of file
diff --git a/datetimepicker-library/res/layout/date_picker_done_button.xml b/datetimepicker-library/res/layout/date_picker_done_button.xml
index 96196c9..c31d216 100644
--- a/datetimepicker-library/res/layout/date_picker_done_button.xml
+++ b/datetimepicker-library/res/layout/date_picker_done_button.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="@dimen/date_picker_component_width"
     android:layout_height="wrap_content"
+    android:padding="@dimen/view_margin_medium"
     style="?android:attr/buttonBarStyle">
 
+    <Button
+        android:textSize="@dimen/done_label_size"
+        android:textColor="@color/done_text_color"
+        android:id="@id/cancel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/view_margin_medium"
+        android:text="@string/cancel_label"
+        android:layout_toStartOf="@id/done"
+        android:layout_toLeftOf="@id/done"
+        style="@style/button_bar_button" />
+
     <Button
         android:textSize="@dimen/done_label_size"
         android:textColor="@color/done_text_color"
         android:id="@id/done"
-        android:layout_width="fill_parent"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_margin="@dimen/view_margin_medium"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:minHeight="48dip"
         android:text="@string/done_label"
-        style="?android:attr/buttonBarButtonStyle" />
-</LinearLayout>
\ No newline at end of file
+        style="@style/button_bar_button" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/datetimepicker-library/res/values-v14/styles.xml b/datetimepicker-library/res/values-v14/styles.xml
new file mode 100644
index 0000000..36b569c
--- /dev/null
+++ b/datetimepicker-library/res/values-v14/styles.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="button_bar_button" parent="@android:style/Widget.Holo.Button.Borderless">
+        <item name="android:gravity">center</item>
+        <item name="android:minHeight">36dip</item>
+        <item name="android:minWidth">64dip</item>
+        <item name="android:paddingBottom">8dip</item>
+        <item name="android:paddingTop">8dip</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/datetimepicker-library/res/values/colors.xml b/datetimepicker-library/res/values/colors.xml
index 2e01f17..9f009a5 100644
--- a/datetimepicker-library/res/values/colors.xml
+++ b/datetimepicker-library/res/values/colors.xml
@@ -3,7 +3,7 @@
     <color name="white">#ffffffff</color>
     <color name="circle_background">#fff2f2f2</color>
     <color name="line_background">#ffcccccc</color>
-    <color name="done_text_color_normal">#ff333333</color>
+    <color name="done_text_color_normal">@color/blue</color>
     <color name="done_text_color_disabled">#ffcccccc</color>
     <color name="blue">#ff33b5e5</color>
     <color name="darker_blue">#ff0099cc</color>
diff --git a/datetimepicker-library/res/values/dimens.xml b/datetimepicker-library/res/values/dimens.xml
index 5d8aebc..4809603 100644
--- a/datetimepicker-library/res/values/dimens.xml
+++ b/datetimepicker-library/res/values/dimens.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="done_label_size">14sp</dimen>
+    <dimen name="done_button_panel_height">48dip</dimen>
     <dimen name="date_picker_component_width">270dip</dimen>
     <dimen name="date_picker_header_height">30dip</dimen>
     <dimen name="selected_calendar_layout_height">155dip</dimen>
@@ -28,6 +29,8 @@
     <dimen name="minimum_margin_sides">48dip</dimen>
     <dimen name="minimum_margin_top_bottom">24dip</dimen>
 
+    <dimen name="view_margin_medium">8dip</dimen>
+
     <item name="circle_radius_multiplier" format="float" type="string">0.82</item>
     <item name="circle_radius_multiplier_24HourMode" format="float" type="string">0.85</item>
     <item name="selection_radius_multiplier" format="float" type="string">0.16</item>
diff --git a/datetimepicker-library/res/values/ids.xml b/datetimepicker-library/res/values/ids.xml
index 1f9fc29..88feb82 100644
--- a/datetimepicker-library/res/values/ids.xml
+++ b/datetimepicker-library/res/values/ids.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <item type="id" name="done">false</item>
+    <item type="id" name="cancel">false</item>
     <item type="id" name="date_picker_header">false</item>
     <item type="id" name="day_picker_selected_date_layout">false</item>
     <item type="id" name="date_picker_month_and_day">false</item>
diff --git a/datetimepicker-library/res/values/strings.xml b/datetimepicker-library/res/values/strings.xml
index e442e83..70aeedc 100644
--- a/datetimepicker-library/res/values/strings.xml
+++ b/datetimepicker-library/res/values/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="http://schemas.android.com/apk/res/android">
-    <string name="done_label">Done</string>
+    <string name="done_label">OK</string>
+    <string name="cancel_label">Cancel</string>
     <string name="day_picker_description">Month grid of days</string>
     <string name="year_picker_description">Year list</string>
     <string name="select_day">Select month and day</string>
diff --git a/datetimepicker-library/res/values/styles.xml b/datetimepicker-library/res/values/styles.xml
index d6f6fb9..cbc540b 100644
--- a/datetimepicker-library/res/values/styles.xml
+++ b/datetimepicker-library/res/values/styles.xml
@@ -27,4 +27,16 @@
     </style>
 
     <style name="day_of_week_label_condensed" />
+
+    <style name="button_bar_button">
+        <item name="android:background">?android:attr/selectableItemBackground</item>
+        <item name="android:gravity">center</item>
+        <item name="android:minHeight">36dip</item>
+        <item name="android:minWidth">64dip</item>
+        <item name="android:paddingBottom">8dip</item>
+        <item name="android:paddingLeft">8dip</item>
+        <item name="android:paddingTop">8dip</item>
+        <item name="android:paddingRight">8dip</item>
+        <item name="android:textStyle">bold</item>
+    </style>
 </resources>
\ No newline at end of file

From d7378645f47752c31725dd701dd8900820d54e33 Mon Sep 17 00:00:00 2001
From: Ugonna <mail@ugonna.co>
Date: Mon, 17 Nov 2014 23:16:46 -0500
Subject: [PATCH 02/11] Changes date-picker header colors

---
 datetimepicker-library/res/color/date_picker_selector.xml   | 6 +++---
 .../res/layout/date_picker_selected_date.xml                | 2 +-
 datetimepicker-library/res/values/colors.xml                | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/datetimepicker-library/res/color/date_picker_selector.xml b/datetimepicker-library/res/color/date_picker_selector.xml
index c0527c3..78f80f1 100644
--- a/datetimepicker-library/res/color/date_picker_selector.xml
+++ b/datetimepicker-library/res/color/date_picker_selector.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:color="@color/darker_blue" />
-    <item android:state_selected="true" android:state_pressed="false" android:color="@color/blue" />
-    <item android:state_selected="false" android:state_pressed="false" android:color="@color/date_picker_text_normal" />
+    <item android:state_pressed="true" android:color="@color/grey" />
+    <item android:state_selected="true" android:state_pressed="false" android:color="@color/white" />
+    <item android:state_selected="false" android:state_pressed="false" android:color="@color/transparent_white" />
 </selector>
\ No newline at end of file
diff --git a/datetimepicker-library/res/layout/date_picker_selected_date.xml b/datetimepicker-library/res/layout/date_picker_selected_date.xml
index 3905683..3fd496c 100644
--- a/datetimepicker-library/res/layout/date_picker_selected_date.xml
+++ b/datetimepicker-library/res/layout/date_picker_selected_date.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center" android:orientation="vertical" android:id="@id/day_picker_selected_date_layout" android:background="@color/white" android:layout_width="@dimen/date_picker_component_width" android:layout_height="0.0dip" android:layout_weight="1.0"
+<LinearLayout android:gravity="center" android:orientation="vertical" android:id="@id/day_picker_selected_date_layout" android:background="@color/blue" android:layout_width="@dimen/date_picker_component_width" android:layout_height="0.0dip" android:layout_weight="1.0"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout android:textColor="@color/date_picker_selector" android:layout_gravity="center" android:orientation="vertical" android:id="@id/date_picker_month_and_day" android:clickable="true" android:layout_width="fill_parent" android:layout_height="wrap_content">
         <TextView android:textSize="@dimen/selected_date_month_size" android:textColor="@color/date_picker_selector" android:gravity="bottom|center" android:id="@id/date_picker_month" android:duplicateParentState="true" android:layout_width="fill_parent" android:layout_height="wrap_content" android:includeFontPadding="false" />
diff --git a/datetimepicker-library/res/values/colors.xml b/datetimepicker-library/res/values/colors.xml
index 9f009a5..8728710 100644
--- a/datetimepicker-library/res/values/colors.xml
+++ b/datetimepicker-library/res/values/colors.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="white">#ffffffff</color>
+    <color name="grey">#ddd</color>
     <color name="circle_background">#fff2f2f2</color>
     <color name="line_background">#ffcccccc</color>
     <color name="done_text_color_normal">@color/blue</color>
@@ -8,11 +9,12 @@
     <color name="blue">#ff33b5e5</color>
     <color name="darker_blue">#ff0099cc</color>
     <color name="date_picker_text_normal">#ff999999</color>
-    <color name="calendar_header">#ff999999</color>
+    <color name="calendar_header">@color/darker_blue</color>
     <color name="date_picker_view_animator">#fff2f2f2</color>
 
     <color name="ampm_text_color">#8c8c8c</color>
     <color name="numbers_text_color">#8c8c8c</color>
 
+    <color name="transparent_white">#aaffffff</color>
     <color name="transparent_black">#7F000000</color>
 </resources>

From 64fbb4366485733871bd0e4d5407539042a56910 Mon Sep 17 00:00:00 2001
From: Ugonna <mail@ugonna.co>
Date: Mon, 17 Nov 2014 23:29:03 -0500
Subject: [PATCH 03/11] Shows short months in a way that works in pre 2.3 (See
 commit 949b848)

---
 .../src/com/fourmob/datetimepicker/date/DatePickerDialog.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datetimepicker-library/src/com/fourmob/datetimepicker/date/DatePickerDialog.java b/datetimepicker-library/src/com/fourmob/datetimepicker/date/DatePickerDialog.java
index 1698147..d6d7da7 100644
--- a/datetimepicker-library/src/com/fourmob/datetimepicker/date/DatePickerDialog.java
+++ b/datetimepicker-library/src/com/fourmob/datetimepicker/date/DatePickerDialog.java
@@ -173,7 +173,7 @@ private void updateDisplay(boolean announce) {
             this.mDayOfWeekView.setText(mDateFormatSymbols.getWeekdays()[this.mCalendar.get(Calendar.DAY_OF_WEEK)].toUpperCase(Locale.getDefault()));
         }
 
-        this.mSelectedMonthTextView.setText(mDateFormatSymbols.getMonths()[this.mCalendar.get(Calendar.MONTH)].toUpperCase(Locale.getDefault()));
+        this.mSelectedMonthTextView.setText(mDateFormatSymbols.getShortMonths()[this.mCalendar.get(Calendar.MONTH)].toUpperCase(Locale.getDefault()));
 
         mSelectedDayTextView.setText(DAY_FORMAT.format(mCalendar.getTime()));
         mYearView.setText(YEAR_FORMAT.format(mCalendar.getTime()));

From d7b69c8d0439d18607c7bba41cbe1370a5144460 Mon Sep 17 00:00:00 2001
From: Ugonna <mail@ugonna.co>
Date: Mon, 17 Nov 2014 23:31:27 -0500
Subject: [PATCH 04/11] Fixes potential error in using vibrator system service

- Vibrator system service was previously called using a hard-coded string, which could change in future Android versions
---
 .../src/com/fourmob/datetimepicker/date/DatePickerDialog.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/datetimepicker-library/src/com/fourmob/datetimepicker/date/DatePickerDialog.java b/datetimepicker-library/src/com/fourmob/datetimepicker/date/DatePickerDialog.java
index d6d7da7..c8c9995 100644
--- a/datetimepicker-library/src/com/fourmob/datetimepicker/date/DatePickerDialog.java
+++ b/datetimepicker-library/src/com/fourmob/datetimepicker/date/DatePickerDialog.java
@@ -1,6 +1,7 @@
 package com.fourmob.datetimepicker.date;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.SystemClock;
@@ -239,7 +240,7 @@ public void onCreate(Bundle bundle) {
 		super.onCreate(bundle);
 		Activity activity = getActivity();
 		activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
-		mVibrator = ((Vibrator) activity.getSystemService("vibrator"));
+		mVibrator = ((Vibrator) activity.getSystemService(Context.VIBRATOR_SERVICE));
 		if (bundle != null) {
 			mCalendar.set(Calendar.YEAR, bundle.getInt(KEY_SELECTED_YEAR));
 			mCalendar.set(Calendar.MONTH, bundle.getInt(KEY_SELECTED_MONTH));

From deee8acbe2270a7a93ceaf07da78ceb75e4ea4b6 Mon Sep 17 00:00:00 2001
From: Ugonna <mail@ugonna.co>
Date: Mon, 17 Nov 2014 23:38:14 -0500
Subject: [PATCH 05/11] Added logic for "Cancel" button in date-picker

---
 .../res/values-v17/styles.xml                 |  4 ++++
 .../datetimepicker/date/DatePickerDialog.java | 20 ++++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 datetimepicker-library/res/values-v17/styles.xml

diff --git a/datetimepicker-library/res/values-v17/styles.xml b/datetimepicker-library/res/values-v17/styles.xml
new file mode 100644
index 0000000..0d2c4cc
--- /dev/null
+++ b/datetimepicker-library/res/values-v17/styles.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+</resources>
\ No newline at end of file
diff --git a/datetimepicker-library/src/com/fourmob/datetimepicker/date/DatePickerDialog.java b/datetimepicker-library/src/com/fourmob/datetimepicker/date/DatePickerDialog.java
index c8c9995..e34a344 100644
--- a/datetimepicker-library/src/com/fourmob/datetimepicker/date/DatePickerDialog.java
+++ b/datetimepicker-library/src/com/fourmob/datetimepicker/date/DatePickerDialog.java
@@ -76,7 +76,6 @@ public class DatePickerDialog extends DialogFragment implements View.OnClickList
 
 	private TextView mDayOfWeekView;
 	private DayPickerView mDayPickerView;
-	private Button mDoneButton;
 	private LinearLayout mMonthAndDayView;
 	private TextView mSelectedDayTextView;
 	private TextView mSelectedMonthTextView;
@@ -297,12 +296,19 @@ public View onCreateView(LayoutInflater layoutInflater, ViewGroup parent, Bundle
 		outAlphaAnimation.setDuration(300L);
 		mAnimator.setOutAnimation(outAlphaAnimation);
 
-		mDoneButton = ((Button) view.findViewById(R.id.done));
-		mDoneButton.setOnClickListener(new View.OnClickListener() {
-			public void onClick(View view) {
+		Button doneButton = ((Button) view.findViewById(R.id.done));
+        Button cancelButton = ((Button) view.findViewById(R.id.cancel));
+		doneButton.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View view) {
                 onDoneButtonClick();
-			}
-		});
+            }
+        });
+        cancelButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dismiss();
+            }
+        });
 
 		updateDisplay(false);
 		setCurrentView(currentView, true);
@@ -322,7 +328,7 @@ private void onDoneButtonClick() {
         tryVibrate();
         if (mCallBack != null) {
             mCallBack.onDateSet(this, mCalendar.get(Calendar.YEAR), mCalendar.get(Calendar.MONTH), mCalendar.get(Calendar.DAY_OF_MONTH));
-}
+        }
         dismiss();
     }
 

From cc7e044503592dac5122ca55591a7a6ca8bf0608 Mon Sep 17 00:00:00 2001
From: Ugonna <mail@ugonna.co>
Date: Tue, 18 Nov 2014 12:37:21 -0500
Subject: [PATCH 06/11] Adjusts calendar font sizes in date-picker to match
 native 5.0 DatePickerDialog

---
 datetimepicker-library/res/values-v16/strings.xml             | 2 +-
 datetimepicker-library/res/values/dimens.xml                  | 4 ++--
 .../src/com/fourmob/datetimepicker/date/SimpleMonthView.java  | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/datetimepicker-library/res/values-v16/strings.xml b/datetimepicker-library/res/values-v16/strings.xml
index fb40bf1..9f7d7b4 100644
--- a/datetimepicker-library/res/values-v16/strings.xml
+++ b/datetimepicker-library/res/values-v16/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- DO NOT TRANSLATE -->
-    <string name="day_of_week_label_typeface">sans-serif-light</string>
+    <string name="day_of_week_label_typeface">sans-serif-medium</string>
 </resources>
diff --git a/datetimepicker-library/res/values/dimens.xml b/datetimepicker-library/res/values/dimens.xml
index 4809603..138bb44 100644
--- a/datetimepicker-library/res/values/dimens.xml
+++ b/datetimepicker-library/res/values/dimens.xml
@@ -7,7 +7,7 @@
     <dimen name="selected_calendar_layout_height">155dip</dimen>
     <dimen name="date_picker_view_animator_height">270dip</dimen>
     <dimen name="month_list_item_header_height">50dip</dimen>
-    <dimen name="month_day_label_text_size">10sp</dimen>
+    <dimen name="month_day_label_text_size">12sp</dimen>
     <dimen name="day_number_select_circle_radius">16dip</dimen>
     <dimen name="month_select_circle_radius">45dip</dimen>
     <dimen name="selected_date_year_size">30dip</dimen>
@@ -15,7 +15,7 @@
     <dimen name="selected_date_month_size">30dip</dimen>
     <dimen name="date_picker_header_text_size">14dip</dimen>
     <dimen name="month_label_size">16sp</dimen>
-    <dimen name="day_number_size">16sp</dimen>
+    <dimen name="day_number_size">12sp</dimen>
     <dimen name="year_label_height">64dip</dimen>
     <dimen name="year_label_text_size">22dip</dimen>
 
diff --git a/datetimepicker-library/src/com/fourmob/datetimepicker/date/SimpleMonthView.java b/datetimepicker-library/src/com/fourmob/datetimepicker/date/SimpleMonthView.java
index 9d7dbd9..e387167 100644
--- a/datetimepicker-library/src/com/fourmob/datetimepicker/date/SimpleMonthView.java
+++ b/datetimepicker-library/src/com/fourmob/datetimepicker/date/SimpleMonthView.java
@@ -130,7 +130,8 @@ private void drawMonthDayLabels(Canvas canvas) {
             int calendarDay = (i + mWeekStart) % mNumDays;
             int x = (2 * i + 1) * dayWidthHalf + mPadding;
             mDayLabelCalendar.set(Calendar.DAY_OF_WEEK, calendarDay);
-            canvas.drawText(mDateFormatSymbols.getShortWeekdays()[mDayLabelCalendar.get(Calendar.DAY_OF_WEEK)].toUpperCase(Locale.getDefault()), x, y, mMonthDayLabelPaint);
+            canvas.drawText(mDateFormatSymbols.getShortWeekdays()[mDayLabelCalendar
+                    .get(Calendar.DAY_OF_WEEK)].toUpperCase(Locale.getDefault()).substring(0, 1), x, y, mMonthDayLabelPaint);
         }
 	}
 

From 85f9dc64852b4e4e5c29f7d3fdba0416c0abd667 Mon Sep 17 00:00:00 2001
From: Ugonna <mail@ugonna.co>
Date: Tue, 18 Nov 2014 14:47:18 -0500
Subject: [PATCH 07/11] Adjusts layout of date-picker in landscape

---
 .../res/layout-land/date_picker_dialog.xml             | 10 +++++-----
 .../res/layout-sw600dp-land/date_picker_dialog.xml     | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/datetimepicker-library/res/layout-land/date_picker_dialog.xml b/datetimepicker-library/res/layout-land/date_picker_dialog.xml
index 96cd4a2..af814b6 100644
--- a/datetimepicker-library/res/layout-land/date_picker_dialog.xml
+++ b/datetimepicker-library/res/layout-land/date_picker_dialog.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center" android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="@dimen/date_picker_view_animator_height"
+<LinearLayout android:gravity="center" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="@dimen/date_picker_view_animator_height"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <LinearLayout android:layout_gravity="center" android:orientation="vertical" android:background="@color/white" android:layout_width="wrap_content" android:layout_height="fill_parent">
-        <LinearLayout android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="0.0dip" android:layout_weight="1.0">
+    <LinearLayout android:layout_gravity="center" android:orientation="horizontal" android:background="@color/white" android:layout_width="wrap_content" android:layout_height="fill_parent">
+        <LinearLayout android:orientation="vertical" android:layout_width="0.0dip" android:layout_height="match_parent" android:layout_weight="1.0">
             <include layout="@layout/date_picker_header_view" />
             <include layout="@layout/date_picker_selected_date" />
         </LinearLayout>
-        <include layout="@layout/date_picker_done_button" />
+        <include layout="@layout/date_picker_view_animator" />
     </LinearLayout>
-    <include layout="@layout/date_picker_view_animator" />
+    <include layout="@layout/date_picker_done_button" android:layout_width="match_parent" android:layout_height="wrap_content" />
 </LinearLayout>
\ No newline at end of file
diff --git a/datetimepicker-library/res/layout-sw600dp-land/date_picker_dialog.xml b/datetimepicker-library/res/layout-sw600dp-land/date_picker_dialog.xml
index 96cd4a2..80f8b1e 100644
--- a/datetimepicker-library/res/layout-sw600dp-land/date_picker_dialog.xml
+++ b/datetimepicker-library/res/layout-sw600dp-land/date_picker_dialog.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center" android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="@dimen/date_picker_view_animator_height"
+<LinearLayout android:gravity="center" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="@dimen/date_picker_view_animator_height"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <LinearLayout android:layout_gravity="center" android:orientation="vertical" android:background="@color/white" android:layout_width="wrap_content" android:layout_height="fill_parent">
-        <LinearLayout android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="0.0dip" android:layout_weight="1.0">
+    <LinearLayout android:layout_gravity="center" android:orientation="horizontal" android:background="@color/white" android:layout_width="wrap_content" android:layout_height="fill_parent">
+        <LinearLayout android:orientation="vertical" android:layout_width="0.0dip" android:layout_height="match_parent" android:layout_weight="1.0">
             <include layout="@layout/date_picker_header_view" />
             <include layout="@layout/date_picker_selected_date" />
         </LinearLayout>
-        <include layout="@layout/date_picker_done_button" />
+        <include layout="@layout/date_picker_view_animator" />
     </LinearLayout>
-    <include layout="@layout/date_picker_view_animator" />
+    <include layout="@layout/date_picker_done_button" />
 </LinearLayout>
\ No newline at end of file

From d606322a30ebba82cbdd14384c5f5d2febf9efd6 Mon Sep 17 00:00:00 2001
From: Ugonna <mail@ugonna.co>
Date: Fri, 21 Nov 2014 20:03:00 -0500
Subject: [PATCH 08/11] Refactored "done" button layout name for more generic
 use in other layouts

---
 .../res/layout-land/date_picker_dialog.xml                | 2 +-
 .../res/layout-sw600dp-land/date_picker_dialog.xml        | 2 +-
 .../res/layout-sw600dp/date_picker_dialog.xml             | 2 +-
 .../res/layout-w270dp-h560dp/date_picker_dialog.xml       | 2 +-
 datetimepicker-library/res/layout/date_picker_dialog.xml  | 2 +-
 ...date_picker_done_button.xml => picker_done_button.xml} | 8 ++++----
 datetimepicker-library/res/values/ids.xml                 | 4 ++--
 .../com/fourmob/datetimepicker/date/DatePickerDialog.java | 4 ++--
 8 files changed, 13 insertions(+), 13 deletions(-)
 rename datetimepicker-library/res/layout/{date_picker_done_button.xml => picker_done_button.xml} (86%)

diff --git a/datetimepicker-library/res/layout-land/date_picker_dialog.xml b/datetimepicker-library/res/layout-land/date_picker_dialog.xml
index af814b6..c7dde11 100644
--- a/datetimepicker-library/res/layout-land/date_picker_dialog.xml
+++ b/datetimepicker-library/res/layout-land/date_picker_dialog.xml
@@ -8,5 +8,5 @@
         </LinearLayout>
         <include layout="@layout/date_picker_view_animator" />
     </LinearLayout>
-    <include layout="@layout/date_picker_done_button" android:layout_width="match_parent" android:layout_height="wrap_content" />
+    <include layout="@layout/picker_done_button" android:layout_width="match_parent" android:layout_height="wrap_content" />
 </LinearLayout>
\ No newline at end of file
diff --git a/datetimepicker-library/res/layout-sw600dp-land/date_picker_dialog.xml b/datetimepicker-library/res/layout-sw600dp-land/date_picker_dialog.xml
index 80f8b1e..592b46d 100644
--- a/datetimepicker-library/res/layout-sw600dp-land/date_picker_dialog.xml
+++ b/datetimepicker-library/res/layout-sw600dp-land/date_picker_dialog.xml
@@ -8,5 +8,5 @@
         </LinearLayout>
         <include layout="@layout/date_picker_view_animator" />
     </LinearLayout>
-    <include layout="@layout/date_picker_done_button" />
+    <include layout="@layout/picker_done_button" />
 </LinearLayout>
\ No newline at end of file
diff --git a/datetimepicker-library/res/layout-sw600dp/date_picker_dialog.xml b/datetimepicker-library/res/layout-sw600dp/date_picker_dialog.xml
index b490fcb..91210ec 100644
--- a/datetimepicker-library/res/layout-sw600dp/date_picker_dialog.xml
+++ b/datetimepicker-library/res/layout-sw600dp/date_picker_dialog.xml
@@ -6,5 +6,5 @@
         <include layout="@layout/date_picker_selected_date" />
     </LinearLayout>
     <include layout="@layout/date_picker_view_animator" />
-    <include layout="@layout/date_picker_done_button" />
+    <include layout="@layout/picker_done_button" />
 </LinearLayout>
\ No newline at end of file
diff --git a/datetimepicker-library/res/layout-w270dp-h560dp/date_picker_dialog.xml b/datetimepicker-library/res/layout-w270dp-h560dp/date_picker_dialog.xml
index b490fcb..91210ec 100644
--- a/datetimepicker-library/res/layout-w270dp-h560dp/date_picker_dialog.xml
+++ b/datetimepicker-library/res/layout-w270dp-h560dp/date_picker_dialog.xml
@@ -6,5 +6,5 @@
         <include layout="@layout/date_picker_selected_date" />
     </LinearLayout>
     <include layout="@layout/date_picker_view_animator" />
-    <include layout="@layout/date_picker_done_button" />
+    <include layout="@layout/picker_done_button" />
 </LinearLayout>
\ No newline at end of file
diff --git a/datetimepicker-library/res/layout/date_picker_dialog.xml b/datetimepicker-library/res/layout/date_picker_dialog.xml
index f813907..a593630 100644
--- a/datetimepicker-library/res/layout/date_picker_dialog.xml
+++ b/datetimepicker-library/res/layout/date_picker_dialog.xml
@@ -5,5 +5,5 @@
         <include layout="@layout/date_picker_selected_date" />
     </LinearLayout>
     <include layout="@layout/date_picker_view_animator" />
-    <include layout="@layout/date_picker_done_button" />
+    <include layout="@layout/picker_done_button" />
 </LinearLayout>
\ No newline at end of file
diff --git a/datetimepicker-library/res/layout/date_picker_done_button.xml b/datetimepicker-library/res/layout/picker_done_button.xml
similarity index 86%
rename from datetimepicker-library/res/layout/date_picker_done_button.xml
rename to datetimepicker-library/res/layout/picker_done_button.xml
index c31d216..371ed75 100644
--- a/datetimepicker-library/res/layout/date_picker_done_button.xml
+++ b/datetimepicker-library/res/layout/picker_done_button.xml
@@ -10,19 +10,19 @@
     <Button
         android:textSize="@dimen/done_label_size"
         android:textColor="@color/done_text_color"
-        android:id="@id/cancel"
+        android:id="@id/cancel_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/view_margin_medium"
         android:text="@string/cancel_label"
-        android:layout_toStartOf="@id/done"
-        android:layout_toLeftOf="@id/done"
+        android:layout_toStartOf="@id/done_button"
+        android:layout_toLeftOf="@id/done_button"
         style="@style/button_bar_button" />
 
     <Button
         android:textSize="@dimen/done_label_size"
         android:textColor="@color/done_text_color"
-        android:id="@id/done"
+        android:id="@id/done_button"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_margin="@dimen/view_margin_medium"
diff --git a/datetimepicker-library/res/values/ids.xml b/datetimepicker-library/res/values/ids.xml
index 88feb82..b9274a7 100644
--- a/datetimepicker-library/res/values/ids.xml
+++ b/datetimepicker-library/res/values/ids.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <item type="id" name="done">false</item>
-    <item type="id" name="cancel">false</item>
+    <item type="id" name="done_button">false</item>
+    <item type="id" name="cancel_button">false</item>
     <item type="id" name="date_picker_header">false</item>
     <item type="id" name="day_picker_selected_date_layout">false</item>
     <item type="id" name="date_picker_month_and_day">false</item>
diff --git a/datetimepicker-library/src/com/fourmob/datetimepicker/date/DatePickerDialog.java b/datetimepicker-library/src/com/fourmob/datetimepicker/date/DatePickerDialog.java
index e34a344..e31eb76 100644
--- a/datetimepicker-library/src/com/fourmob/datetimepicker/date/DatePickerDialog.java
+++ b/datetimepicker-library/src/com/fourmob/datetimepicker/date/DatePickerDialog.java
@@ -296,8 +296,8 @@ public View onCreateView(LayoutInflater layoutInflater, ViewGroup parent, Bundle
 		outAlphaAnimation.setDuration(300L);
 		mAnimator.setOutAnimation(outAlphaAnimation);
 
-		Button doneButton = ((Button) view.findViewById(R.id.done));
-        Button cancelButton = ((Button) view.findViewById(R.id.cancel));
+		Button doneButton = ((Button) view.findViewById(R.id.done_button));
+        Button cancelButton = ((Button) view.findViewById(R.id.cancel_button));
 		doneButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 onDoneButtonClick();

From 9218d8034f89793160778259b5753d7a15dcc240 Mon Sep 17 00:00:00 2001
From: Ugonna <mail@ugonna.co>
Date: Fri, 21 Nov 2014 22:28:25 -0500
Subject: [PATCH 09/11] Changes layout of time-picker dialog - Removes divider
 - Uses an "OK/Cancel" paradigm as suggested by guidelines for picker dialogs
 - Changes colors to match native TimePickerDialog in Lollipop

---
 .../res/layout-land/time_picker_dialog.xml    | 56 +++++++------------
 .../res/layout/time_header_label.xml          |  4 +-
 .../res/layout/time_picker_dialog.xml         | 22 +-------
 datetimepicker-library/res/values/styles.xml  |  4 +-
 .../datetimepicker/time/TimePickerDialog.java | 16 +++---
 5 files changed, 34 insertions(+), 68 deletions(-)

diff --git a/datetimepicker-library/res/layout-land/time_picker_dialog.xml b/datetimepicker-library/res/layout-land/time_picker_dialog.xml
index d24cfc0..4937849 100644
--- a/datetimepicker-library/res/layout-land/time_picker_dialog.xml
+++ b/datetimepicker-library/res/layout-land/time_picker_dialog.xml
@@ -16,56 +16,38 @@
   -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/time_picker_dialog"
-    android:layout_height="@dimen/dialog_height"
+    android:layout_height="wrap_content"
     android:layout_width="wrap_content"
-    android:orientation="horizontal"
+    android:orientation="vertical"
     android:focusable="true"
     android:layout_marginLeft="@dimen/minimum_margin_sides"
     android:layout_marginRight="@dimen/minimum_margin_sides"
     android:layout_marginTop="@dimen/minimum_margin_top_bottom"
     android:layout_marginBottom="@dimen/minimum_margin_top_bottom" >
     <LinearLayout
-        android:layout_width="@dimen/left_side_width"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dialog_height"
+        android:orientation="horizontal">
         <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1"
-            android:background="@color/white" >
+            android:layout_width="@dimen/left_side_width"
+            android:layout_height="match_parent"
+            android:background="@color/blue" >
             <include
                 layout="@layout/time_header_label"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/header_height"
                 android:layout_gravity="center" />
         </FrameLayout>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="@color/line_background" />
-        <LinearLayout
-            style="?android:attr/buttonBarStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:background="@color/white" >
-            <Button
-                android:id="@+id/done_button"
-                style="?android:attr/buttonBarButtonStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:minHeight="48dp"
-                android:text="@string/done_label"
-                android:textSize="@dimen/done_label_size"
-                android:textColor="@color/done_text_color" />
-        </LinearLayout>
+        <com.sleepbot.datetimepicker.time.RadialPickerLayout
+            android:id="@+id/time_picker"
+            android:layout_width="@dimen/picker_dimen"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:background="@color/circle_background" />
     </LinearLayout>
-    <com.sleepbot.datetimepicker.time.RadialPickerLayout
-        android:id="@+id/time_picker"
-        android:layout_width="@dimen/picker_dimen"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:background="@color/circle_background" />
+    <include layout="@layout/picker_done_button"
+             android:layout_height="wrap_content"
+             android:layout_width="match_parent" />
 </LinearLayout>
diff --git a/datetimepicker-library/res/layout/time_header_label.xml b/datetimepicker-library/res/layout/time_header_label.xml
index 2392245..015d11f 100644
--- a/datetimepicker-library/res/layout/time_header_label.xml
+++ b/datetimepicker-library/res/layout/time_header_label.xml
@@ -18,7 +18,7 @@
       android:layout_width="match_parent"
       android:layout_height="match_parent"
       android:layout_gravity="center"
-      android:background="@color/white" >
+      android:background="@color/blue" >
         <View
             android:id="@+id/center_view"
             android:layout_width="1dp"
@@ -51,7 +51,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/time_placeholder"
-                android:textColor="@color/blue"
+                android:textColor="@color/white"
                 android:gravity="center_horizontal"
                 android:layout_gravity="center"
                 style="@style/time_label" />
diff --git a/datetimepicker-library/res/layout/time_picker_dialog.xml b/datetimepicker-library/res/layout/time_picker_dialog.xml
index 4b275b8..10c91cd 100644
--- a/datetimepicker-library/res/layout/time_picker_dialog.xml
+++ b/datetimepicker-library/res/layout/time_picker_dialog.xml
@@ -39,23 +39,7 @@
         android:layout_gravity="center"
         android:focusable="true"
         android:focusableInTouchMode="true" />
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dip"
-        android:background="@color/line_background" />
-    <LinearLayout
-        style="?android:attr/buttonBarStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-        <Button
-            android:id="@+id/done_button"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="48dp"
-            android:text="@string/done_label"
-            android:textSize="@dimen/done_label_size"
-            android:textColor="@color/done_text_color"
-            style="?android:attr/buttonBarButtonStyle" />
-    </LinearLayout>
+    <include layout="@layout/picker_done_button"
+             android:layout_height="wrap_content"
+             android:layout_width="match_parent" />
 </LinearLayout>
diff --git a/datetimepicker-library/res/values/styles.xml b/datetimepicker-library/res/values/styles.xml
index cbc540b..3994bf1 100644
--- a/datetimepicker-library/res/values/styles.xml
+++ b/datetimepicker-library/res/values/styles.xml
@@ -17,12 +17,12 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <style name="time_label">
         <item name="android:textSize">@dimen/time_label_size</item>
-        <item name="android:textColor">@color/numbers_text_color</item>
+        <item name="android:textColor">@color/transparent_white</item>
     </style>
 
     <style name="ampm_label">
         <item name="android:textSize">@dimen/ampm_label_size</item>
-        <item name="android:textColor">@color/ampm_text_color</item>
+        <item name="android:textColor">@color/transparent_white</item>
         <item name="android:textStyle">bold</item>
     </style>
 
diff --git a/datetimepicker-library/src/com/sleepbot/datetimepicker/time/TimePickerDialog.java b/datetimepicker-library/src/com/sleepbot/datetimepicker/time/TimePickerDialog.java
index a186bf2..a27b6f4 100644
--- a/datetimepicker-library/src/com/sleepbot/datetimepicker/time/TimePickerDialog.java
+++ b/datetimepicker-library/src/com/sleepbot/datetimepicker/time/TimePickerDialog.java
@@ -78,8 +78,8 @@ public class TimePickerDialog extends DialogFragment implements RadialPickerLayo
     private View mAmPmHitspace;
     private RadialPickerLayout mTimePicker;
 
-    private int mBlue;
-    private int mBlack;
+    private int mWhite;
+    private int mUnfocusedWhite;
     private String mAmText;
     private String mPmText;
 
@@ -197,8 +197,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         mSelectHours = res.getString(R.string.select_hours);
         mMinutePickerDescription = res.getString(R.string.minute_picker_description);
         mSelectMinutes = res.getString(R.string.select_minutes);
-        mBlue = res.getColor(R.color.blue);
-        mBlack = res.getColor(R.color.numbers_text_color);
+        mWhite = res.getColor(R.color.white);
+        mUnfocusedWhite = res.getColor(R.color.transparent_white);
 
         mHourView = (TextView) view.findViewById(R.id.hours);
         mHourView.setOnKeyListener(keyboardListener);
@@ -440,8 +440,8 @@ private void setCurrentItemShowing(int index, boolean animateCircle, boolean del
             labelToAnimate = mMinuteView;
         }
 
-        int hourColor = (index == HOUR_INDEX) ? mBlue : mBlack;
-        int minuteColor = (index == MINUTE_INDEX) ? mBlue : mBlack;
+        int hourColor = (index == HOUR_INDEX) ? mWhite : mUnfocusedWhite;
+        int minuteColor = (index == MINUTE_INDEX) ? mWhite : mUnfocusedWhite;
         mHourView.setTextColor(hourColor);
         mMinuteView.setTextColor(minuteColor);
 
@@ -661,10 +661,10 @@ private void updateDisplay(boolean allowEmptyDisplay) {
                     String.format(minuteFormat, values[1]).replace(' ', mPlaceholderText);
             mHourView.setText(hourStr);
             mHourSpaceView.setText(hourStr);
-            mHourView.setTextColor(mBlack);
+            mHourView.setTextColor(mUnfocusedWhite);
             mMinuteView.setText(minuteStr);
             mMinuteSpaceView.setText(minuteStr);
-            mMinuteView.setTextColor(mBlack);
+            mMinuteView.setTextColor(mUnfocusedWhite);
             if (!mIs24HourMode) {
                 updateAmPmDisplay(values[2]);
             }

From db5cbc3fc15ace7de4c010fb63df8015f022013e Mon Sep 17 00:00:00 2001
From: Ugonna <mail@ugonna.co>
Date: Fri, 21 Nov 2014 22:45:14 -0500
Subject: [PATCH 10/11] Added logic for "Cancel" button in time-picker

---
 .../com/sleepbot/datetimepicker/time/TimePickerDialog.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/datetimepicker-library/src/com/sleepbot/datetimepicker/time/TimePickerDialog.java b/datetimepicker-library/src/com/sleepbot/datetimepicker/time/TimePickerDialog.java
index a27b6f4..eb15bcf 100644
--- a/datetimepicker-library/src/com/sleepbot/datetimepicker/time/TimePickerDialog.java
+++ b/datetimepicker-library/src/com/sleepbot/datetimepicker/time/TimePickerDialog.java
@@ -264,6 +264,13 @@ public void onClick(View v) {
             }
         });
         mDoneButton.setOnKeyListener(keyboardListener);
+        
+        view.findViewById(R.id.cancel_button).setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dismiss();
+            }
+        });
 
         // Enable or disable the AM/PM view.
         mAmPmHitspace = view.findViewById(R.id.ampm_hitspace);

From 27f9d053805c4c942ffefa2ebc350942b46c65de Mon Sep 17 00:00:00 2001
From: Ugonna <mail@ugonna.co>
Date: Fri, 21 Nov 2014 23:18:05 -0500
Subject: [PATCH 11/11] Changed background color of "done" button view to match
 surrounding container in landscape

This is unnecessary in portrait mode, but may suffice for now.
---
 datetimepicker-library/res/layout/picker_done_button.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/datetimepicker-library/res/layout/picker_done_button.xml b/datetimepicker-library/res/layout/picker_done_button.xml
index 371ed75..f43b1b2 100644
--- a/datetimepicker-library/res/layout/picker_done_button.xml
+++ b/datetimepicker-library/res/layout/picker_done_button.xml
@@ -4,6 +4,7 @@
     android:orientation="vertical"
     android:layout_width="@dimen/date_picker_component_width"
     android:layout_height="wrap_content"
+    android:background="@color/circle_background"
     android:padding="@dimen/view_margin_medium"
     style="?android:attr/buttonBarStyle">