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

Commit 59b82942 authored by Matthew Tait's avatar Matthew Tait Committed by Android (Google) Code Review
Browse files

Merge "Fixes date and time picker to use integer values" into cw-f-dev

parents 86a0009c 7a323e2e

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

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

<!--

/*

** Copyright 2012, 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.

*/

-->

<resources>

  <!-- Specifies date picker mode to be 'spinner' -->

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



  <!-- Specifies time picker mode to be 'spinner' -->

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

</resources>

core/res/res/values-watch/strings.xml

+0 −6
Original line number Diff line number Diff line
@@ -26,10 +26,4 @@ 


    <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. Override from base which says "Body Sensors". [CHAR_LIMIT=25] -->

    <string name="permgrouplab_sensors">Sensors</string>



    <!-- Do not translate.  timepicker mode, overridden for watch -->

    <string name="time_picker_mode" translatable="false">"spinner"</string>



    <!-- Do not translate.  datepicker mode, overridden for watch -->

    <string name="date_picker_mode" translatable="false">"spinner"</string>

</resources>

core/res/res/values/integers.xml

+7 −0
Original line number Diff line number Diff line
@@ -26,5 +26,12 @@ 


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

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



    <!-- Specifies date picker mode to be 'calendar' -->

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



    <!-- Specifies time picker mode to be 'clock' -->

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



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

</resources>

core/res/res/values/styles_material.xml

+2 −2
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ please see styles_device_defaults.xml. 
    </style>



    <style name="Widget.Material.TimePicker">

        <item name="timePickerMode">@string/time_picker_mode</item>

        <item name="timePickerMode">@integer/time_picker_mode_material</item>

        <item name="legacyLayout">@layout/time_picker_legacy_material</item>

        <!-- Attributes for new-style TimePicker. -->

        <item name="internalLayout">@layout/time_picker_material</item>
@@ -703,7 +703,7 @@ please see styles_device_defaults.xml. 
    </style>



    <style name="Widget.Material.DatePicker">

        <item name="datePickerMode">@string/date_picker_mode</item>

        <item name="datePickerMode">@integer/date_picker_mode_material</item>

        <item name="legacyLayout">@layout/date_picker_legacy_holo</item>

        <item name="calendarViewShown">true</item>

        <!-- Attributes for new-style DatePicker. -->