Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4490774b authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Make the DatePicker dialog fit on smaller screens in landscape mode" into lmp-mr1-dev

parents 43a4a8c7 f39d6502

core/res/res/layout-land/date_picker_holo.xml

+4 −2
Original line number Diff line number Diff line
@@ -18,12 +18,14 @@ 
              android:layout_width="match_parent"

              android:layout_height="@dimen/datepicker_view_animator_height"

              android:gravity="center"

              android:orientation="horizontal" >

              android:orientation="horizontal"

              android:minWidth="@dimen/datepicker_dialog_width" >



    <include

        layout="@layout/date_picker_selected_date"

        android:layout_width="wrap_content"

        android:layout_height="match_parent" />

        android:layout_height="match_parent"

        android:layout_weight="1" />



    <include layout="@layout/date_picker_view_animator" />

core/res/res/layout/date_picker_selected_date.xml

+6 −6
Original line number Diff line number Diff line
@@ -20,22 +20,22 @@ 
    android:layout_width="@dimen/datepicker_component_width"

    android:layout_height="wrap_content"

    android:gravity="center"

    android:paddingBottom="8dp"

    android:orientation="vertical">



    <TextView

        android:id="@+id/date_picker_header"

        android:layout_width="@dimen/datepicker_component_width"

        android:layout_width="match_parent"

        android:layout_height="@dimen/datepicker_header_height"

        android:gravity="center"

        android:importantForAccessibility="no"

        android:layout_marginBottom="8dp" />

        android:importantForAccessibility="no" />



    <LinearLayout

        android:id="@+id/date_picker_month_day_year_layout"

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1"

        android:paddingTop="4dp"

        android:paddingBottom="4dp"

        android:orientation="vertical"

        android:gravity="center">
@@ -57,8 +57,8 @@ 
                android:id="@+id/date_picker_day"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginTop="-10dip"

                android:layout_marginBottom="-10dip"

                android:layout_marginTop="-23dp"

                android:layout_marginBottom="-20dp"

                android:duplicateParentState="true"

                android:gravity="center" />

        </LinearLayout>

core/res/res/values/dimens.xml

+3 −2
Original line number Diff line number Diff line
@@ -385,12 +385,13 @@ 
    <dimen name="datepicker_month_day_label_text_size">12sp</dimen>

    <dimen name="datepicker_month_list_item_header_height">48dp</dimen>

    <dimen name="datepicker_day_number_select_circle_radius">16dp</dimen>

    <dimen name="datepicker_view_animator_height">244dp</dimen>

    <dimen name="datepicker_view_animator_height">226dp</dimen>



    <dimen name="datepicker_year_picker_padding_top">8dp</dimen>

    <dimen name="datepicker_year_label_height">64dp</dimen>

    <dimen name="datepicker_year_label_text_size">22dp</dimen>

    <dimen name="datepicker_component_width">270dp</dimen>

    <dimen name="datepicker_component_width">260dp</dimen>

    <dimen name="datepicker_dialog_width">520dp</dimen>

    <dimen name="datepicker_selected_date_day_size">88dp</dimen>

    <dimen name="datepicker_selected_date_month_size">24dp</dimen>

    <dimen name="datepicker_selected_date_year_size">24dp</dimen>