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

Commit 87f8b8c5 authored by Matthew Tait's avatar Matthew Tait
Browse files

Changes styling on number, date and time pickers. 

Makes them more usable on a watch by decreasing their size
to be less than the height of small watches.

bug: 29939405
Change-Id: I16d4312c834336c29cd178c6a65369cde79d990c
parent 6d0c9ffc

core/res/res/layout-watch/date_picker_dialog.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2007 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.

-->



<DatePicker xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/datePicker"

    android:layout_gravity="center_horizontal"

    android:gravity="center_horizontal"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:spinnersShown="true"

    android:calendarViewShown="false"

    android:datePickerMode="@integer/date_picker_mode" />

core/res/res/layout-watch/number_picker_material.xml→core/res/res/layout-watch/time_picker_dialog.xml

+8 −13
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

**

** Copyright 2012, The Android Open Source Project

** Copyright 2007, 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.
@@ -17,15 +17,10 @@ 
*/

-->



<merge xmlns:android="http://schemas.android.com/apk/res/android">



    <view class="android.widget.NumberPicker$CustomEditText"

        android:textAppearance="?android:attr/textAppearanceLarge"

        android:id="@+id/numberpicker_input"

        android:layout_width="fill_parent"

<TimePicker xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/timePicker"

    android:layout_gravity="center_horizontal"

    android:gravity="center_horizontal"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

        android:gravity="center"

        android:singleLine="true"

        android:background="@null" />



</merge>
 
    android:timePickerMode="@integer/time_picker_mode" />

core/res/res/layout/date_picker_legacy_holo.xml

+6 −6
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ 
            android:id="@+id/month"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="16dip"

            android:layout_marginBottom="16dip"

            android:layout_marginTop="@dimen/picker_top_margin"

            android:layout_marginBottom="@dimen/picker_bottom_margin"

            android:layout_marginStart="8dip"

            android:layout_marginEnd="8dip"

            android:focusable="true"
@@ -54,8 +54,8 @@ 
            android:id="@+id/day"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="16dip"

            android:layout_marginBottom="16dip"

            android:layout_marginTop="@dimen/picker_top_margin"

            android:layout_marginBottom="@dimen/picker_bottom_margin"

            android:layout_marginStart="8dip"

            android:layout_marginEnd="8dip"

            android:focusable="true"
@@ -67,8 +67,8 @@ 
            android:id="@+id/year"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="16dip"

            android:layout_marginBottom="16dip"

            android:layout_marginTop="@dimen/picker_top_margin"

            android:layout_marginBottom="@dimen/picker_bottom_margin"

            android:layout_marginStart="8dip"

            android:layout_marginEnd="16dip"

            android:focusable="true"

core/res/res/layout/number_picker_material.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,4 +22,4 @@ 
      android:gravity="center"

      android:singleLine="true"

      android:background="@null"

      android:textAppearance="@style/TextAppearance.Material.Body1" />
 
      android:textAppearance="@style/TextAppearance.Material.NumberPicker" />

core/res/res/layout/time_picker_legacy_material.xml

+6 −6
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ 
            android:id="@+id/hour"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="16dip"

            android:layout_marginBottom="16dip"

            android:layout_marginTop="@dimen/picker_top_margin"

            android:layout_marginBottom="@dimen/picker_bottom_margin"

            android:focusable="true"

            android:focusableInTouchMode="true"

            />
@@ -62,8 +62,8 @@ 
            android:id="@+id/minute"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="16dip"

            android:layout_marginBottom="16dip"

            android:layout_marginTop="@dimen/picker_top_margin"

            android:layout_marginBottom="@dimen/picker_bottom_margin"

            android:focusable="true"

            android:focusableInTouchMode="true"

            />
@@ -75,8 +75,8 @@ 
        android:id="@+id/amPm"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="16dip"

        android:layout_marginBottom="16dip"

        android:layout_marginTop="@dimen/picker_top_margin"

        android:layout_marginBottom="@dimen/picker_bottom_margin"

        android:layout_marginStart="8dip"

        android:layout_marginEnd="8dip"

        android:focusable="true"