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

Commit 26fcca7a authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

Merge \"Fix: DatePicker can\'t show long date string at landscape\" into nyc-mr1-dev 

am: c71fc245

Change-Id: I0eb02309a668fb850f3b0b9679c8f75fc211e932
parents 753fee62 c71fc245

core/res/res/layout/date_picker_header_material.xml

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
            android:textAppearance="@style/TextAppearance.Material.DatePicker.DateLabel"

            android:includeFontPadding="false"

            android:gravity="start"

            android:maxLines="2"

            android:maxLines="@integer/date_picker_header_max_lines_material"

            android:ellipsize="none" />

    </LinearLayout>

</LinearLayout>

core/res/res/values-land/integers.xml

+2 −0
Original line number Diff line number Diff line
@@ -23,4 +23,6 @@ 
    <integer name="kg_widget_region_weight">45</integer>

    <integer name="kg_security_flipper_weight">55</integer>

    <integer name="kg_glowpad_rotation_offset">-90</integer>



    <integer name="date_picker_header_max_lines_material">4</integer>

</resources>

core/res/res/values/integers.xml

+1 −0
Original line number Diff line number Diff line
@@ -26,4 +26,5 @@ 


    <integer name="date_picker_mode">1</integer>

    <integer name="time_picker_mode">1</integer>

    <integer name="date_picker_header_max_lines_material">2</integer>

</resources>