Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes date and time picker to use integer values

Browse Source 
bug: 30676304
Change-Id: Ieb1f059153219d7e4fcd29afd38333fcc6448d25
This commit is contained in:
Matthew Tait
2016-08-09 17:54:11 +01:00
parent c32929ab1a
commit 7a323e2eff
4 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/res/res/values-watch/integers.xml Normal file
View File

@@ -0,0 +1,25 @@
<?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>

6
core/res/res/values-watch/strings.xml
View File

@@ -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>

7
core/res/res/values/integers.xml
View File

@@ -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>

4
core/res/res/values/styles_material.xml
View File

@@ -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. -->