From f0b9f484175bd2db7dad7a5ac178ac05d5cbcd79 Mon Sep 17 00:00:00 2001
From: Paul Blessing <paulblessing@gmail.com>
Date: Thu, 27 Mar 2014 07:51:31 -0500
Subject: [PATCH] Fix some dialog and font size concerns.

- Add horizontal layout weights to the picker dialogs in layout-land so that the pickers don't go off screen on smaller devices.
- Copy the original picker layout-land files to layout-w500dp-land where there is enough room for the original layout.
- Update time picker label font sizes from sp to dip for smaller screens so that double-digit hours do not disappear when the Font Size is set to Huge.
---
 .../res/layout-land/date_picker_dialog.xml    |  4 +-
 .../res/layout-land/time_picker_dialog.xml    |  3 +-
 .../layout-w500dp-land/date_picker_dialog.xml | 13 ++++
 .../layout-w500dp-land/time_picker_dialog.xml | 71 +++++++++++++++++++
 .../res/values-sw600dp-land/dimens.xml        |  4 +-
 datetimepicker-library/res/values/dimens.xml  |  2 +-
 6 files changed, 91 insertions(+), 6 deletions(-)
 create mode 100644 datetimepicker-library/res/layout-w500dp-land/date_picker_dialog.xml
 create mode 100644 datetimepicker-library/res/layout-w500dp-land/time_picker_dialog.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..842d386 100644
--- a/datetimepicker-library/res/layout-land/date_picker_dialog.xml
+++ b/datetimepicker-library/res/layout-land/date_picker_dialog.xml
@@ -9,5 +9,5 @@
         <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" />
-</LinearLayout>
\ No newline at end of file
+    <include layout="@layout/date_picker_view_animator" android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" />
+</LinearLayout>
diff --git a/datetimepicker-library/res/layout-land/time_picker_dialog.xml b/datetimepicker-library/res/layout-land/time_picker_dialog.xml
index d24cfc0..441c589 100644
--- a/datetimepicker-library/res/layout-land/time_picker_dialog.xml
+++ b/datetimepicker-library/res/layout-land/time_picker_dialog.xml
@@ -62,8 +62,9 @@
     </LinearLayout>
     <com.sleepbot.datetimepicker.time.RadialPickerLayout
         android:id="@+id/time_picker"
-        android:layout_width="@dimen/picker_dimen"
+        android:layout_width="0dp"
         android:layout_height="match_parent"
+        android:layout_weight="1"
         android:layout_gravity="center"
         android:focusable="true"
         android:focusableInTouchMode="true"
diff --git a/datetimepicker-library/res/layout-w500dp-land/date_picker_dialog.xml b/datetimepicker-library/res/layout-w500dp-land/date_picker_dialog.xml
new file mode 100644
index 0000000..09a1a67
--- /dev/null
+++ b/datetimepicker-library/res/layout-w500dp-land/date_picker_dialog.xml
@@ -0,0 +1,13 @@
+<?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"
+  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">
+            <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" />
+</LinearLayout>
\ No newline at end of file
diff --git a/datetimepicker-library/res/layout-w500dp-land/time_picker_dialog.xml b/datetimepicker-library/res/layout-w500dp-land/time_picker_dialog.xml
new file mode 100644
index 0000000..d24cfc0
--- /dev/null
+++ b/datetimepicker-library/res/layout-w500dp-land/time_picker_dialog.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2013 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/time_picker_dialog"
+    android:layout_height="@dimen/dialog_height"
+    android:layout_width="wrap_content"
+    android:orientation="horizontal"
+    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">
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:background="@color/white" >
+            <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>
+    </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>
diff --git a/datetimepicker-library/res/values-sw600dp-land/dimens.xml b/datetimepicker-library/res/values-sw600dp-land/dimens.xml
index c19dd8c..9bfcb44 100644
--- a/datetimepicker-library/res/values-sw600dp-land/dimens.xml
+++ b/datetimepicker-library/res/values-sw600dp-land/dimens.xml
@@ -22,7 +22,7 @@
 
     <dimen name="date_picker_header_height">45dp</dimen>
     <dimen name="time_label_right_padding">16sp</dimen>
-    <dimen name="time_label_size">64sp</dimen>
+    <dimen name="time_label_size">64dip</dimen>
     <dimen name="ampm_label_size">21sp</dimen>
     <dimen name="ampm_left_padding">7dip</dimen>
     <dimen name="separator_padding">5dip</dimen>
@@ -30,4 +30,4 @@
     <dimen name="footer_height">48dip</dimen>
     <dimen name="left_side_width">315dip</dimen>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/datetimepicker-library/res/values/dimens.xml b/datetimepicker-library/res/values/dimens.xml
index 5d8aebc..d0ea2e8 100644
--- a/datetimepicker-library/res/values/dimens.xml
+++ b/datetimepicker-library/res/values/dimens.xml
@@ -18,7 +18,7 @@
     <dimen name="year_label_height">64dip</dimen>
     <dimen name="year_label_text_size">22dip</dimen>
 
-    <dimen name="time_label_size">60sp</dimen>
+    <dimen name="time_label_size">60dip</dimen>
     <dimen name="extra_time_label_margin">-30dp</dimen>
     <dimen name="ampm_label_size">16sp</dimen>
     <dimen name="ampm_left_padding">6dip</dimen>