diff options
| author | James Kung <kingkung@google.com> | 2013-04-08 15:39:44 -0700 |
|---|---|---|
| committer | James Kung <kingkung@google.com> | 2013-04-08 15:42:43 -0700 |
| commit | f6de1f602ffac70987ebc9fc5e887494a23ddd35 (patch) | |
| tree | 55cac72792c5d41fc14c414c4813116d6f1bdaed /res/layout | |
| parent | f3b38bd61d583d31200c501f5a74392aac510657 (diff) | |
| download | datetimepicker-f6de1f602ffac70987ebc9fc5e887494a23ddd35.tar.gz | |
Date Picker UI revision
Change-Id: Ifeab24a1809a82704f7f0e3382968dc3218cbfcd
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/date_picker_dialog.xml | 4 | ||||
| -rw-r--r-- | res/layout/date_picker_selected_date.xml | 71 |
2 files changed, 47 insertions, 28 deletions
diff --git a/res/layout/date_picker_dialog.xml b/res/layout/date_picker_dialog.xml index 596b3bd..658e7f6 100644 --- a/res/layout/date_picker_dialog.xml +++ b/res/layout/date_picker_dialog.xml @@ -23,8 +23,8 @@ <include layout="@layout/date_picker_selected_date" android:id="@+id/date_picker_selected_date_layout" /> - <android.support.v4.view.ViewPager - android:id="@+id/pager" + <ViewAnimator + android:id="@+id/animator" android:layout_width="@dimen/pager_width" android:layout_height="@dimen/pager_height" android:gravity="center" diff --git a/res/layout/date_picker_selected_date.xml b/res/layout/date_picker_selected_date.xml index 639a7a8..c65fd20 100644 --- a/res/layout/date_picker_selected_date.xml +++ b/res/layout/date_picker_selected_date.xml @@ -32,36 +32,55 @@ android:textColor="@color/white" android:textSize="@dimen/date_picker_header_text_size" /> - <TextView - android:id="@+id/date_picker_month" + <LinearLayout android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" - android:gravity="center_horizontal|bottom" - android:includeFontPadding="false" - android:textColor="@color/date_picker_selector" - android:textSize="@dimen/selected_date_month_size" /> - - <TextView - android:id="@+id/date_picker_day" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_marginBottom="-10dip" - android:layout_marginTop="-10dip" android:gravity="center" - android:includeFontPadding="false" - android:textColor="@color/date_picker_selector" - android:textSize="@dimen/selected_date_day_size" /> + android:orientation="vertical" > - <TextView - android:id="@+id/date_picker_year" - android:layout_width="match_parent" - android:layout_height="0dip" - android:layout_weight="1" - android:gravity="center_horizontal|top" - android:includeFontPadding="false" - android:textColor="@color/date_picker_selector" - android:textSize="@dimen/selected_date_year_size" /> + <LinearLayout + android:id="@+id/date_picker_month_and_day" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:clickable="true" + android:orientation="vertical" + android:textColor="@color/date_picker_selector" > + + <TextView + android:id="@+id/date_picker_month" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:duplicateParentState="true" + android:gravity="center_horizontal|bottom" + android:includeFontPadding="false" + android:textColor="@color/date_picker_selector" + android:textSize="@dimen/selected_date_month_size" /> + + <TextView + android:id="@+id/date_picker_day" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_marginBottom="-10dip" + android:layout_marginTop="-10dip" + android:duplicateParentState="true" + android:gravity="center" + android:includeFontPadding="false" + android:textColor="@color/date_picker_selector" + android:textSize="@dimen/selected_date_day_size" /> + </LinearLayout> + + <TextView + android:id="@+id/date_picker_year" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:gravity="center_horizontal|top" + android:includeFontPadding="false" + android:textColor="@color/date_picker_selector" + android:textSize="@dimen/selected_date_year_size" /> + </LinearLayout> </LinearLayout>
\ No newline at end of file |