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

Commit 38b7f080 authored by Danny Baumann's avatar Danny Baumann
Browse files

Allow editing of events without year.

The forked DatePicker and DatePickerDialog were taken straight from ICS.

Change-Id: I132f1fc8a4b24d0e60867081831e3cebf147be41
parent 7b97cfb9
Loading
Loading
Loading
Loading
+78 −0
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
**
** 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.
** 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.
*/
-->

<!-- Layout of date picker-->

<!-- Warning: everything within the parent is removed and re-ordered depending
     on the date format selected by the user. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="vertical"
    android:layout_gravity="center_horizontal"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content">

    <CheckBox
        android:id="@+id/yearToggle"
        android:text="@string/date_year_toggle"
        android:paddingTop="5dip"
        android:paddingBottom="5dip"
        android:textAppearance="?android:attr/textAppearanceLarge"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"/>
    <LinearLayout
        android:id="@+id/parent"
        android:orientation="horizontal"
        android:layout_gravity="center_horizontal"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content">

        <!-- Month -->
        <NumberPicker
            android:id="@+id/month"
            android:layout_width="80dip"
            android:layout_height="wrap_content"
            android:layout_marginLeft="1dip"
            android:layout_marginRight="1dip"
            android:focusable="true"
            android:focusableInTouchMode="true"
            />

        <!-- Day -->
        <NumberPicker
            android:id="@+id/day"
            android:layout_width="80dip"
            android:layout_height="wrap_content"
            android:layout_marginLeft="1dip"
            android:layout_marginRight="1dip"
            android:focusable="true"
            android:focusableInTouchMode="true"
            />

        <!-- Year -->
        <NumberPicker
            android:id="@+id/year"
            android:layout_width="95dip"
            android:layout_height="wrap_content"
            android:layout_marginLeft="1dip"
            android:layout_marginRight="1dip"
            android:focusable="true"
            android:focusableInTouchMode="true"
            />
    </LinearLayout>
</LinearLayout>
+26 −0
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
**
** Copyright 2010, 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.
*/
-->

<view xmlns:android="http://schemas.android.com/apk/res/android"
    class="com.android.contacts.datepicker.DatePicker"
    android:id="@+id/datePicker"
    android:padding="5dip"
    android:layout_gravity="center_horizontal"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"/>
+3 −0
Original line number Original line Diff line number Diff line
@@ -389,4 +389,7 @@
    <string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"إعادة محاولة الترقية"</string>
    <string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"إعادة محاولة الترقية"</string>
    <string name="search_results_for" msgid="8705490885073188513">"نتائج البحث عن: <xliff:g id="QUERY">%s</xliff:g>"</string>
    <string name="search_results_for" msgid="8705490885073188513">"نتائج البحث عن: <xliff:g id="QUERY">%s</xliff:g>"</string>
    <string name="search_results_searching" msgid="7755623475227227314">"جارِ البحث..."</string>
    <string name="search_results_searching" msgid="7755623475227227314">"جارِ البحث..."</string>
    <string name="date_year_toggle" msgid="7356532842767854606">"عرض السنة"</string>
    <string name="date_format_short_no_year">d/M</string>
    <string name="date_format_full_no_year">d MMMM</string>
</resources>
</resources>
+4 −0
Original line number Original line Diff line number Diff line
@@ -398,4 +398,8 @@
    <string name="t9_map_row_7">7pqrsфхцч</string>
    <string name="t9_map_row_7">7pqrsфхцч</string>
    <string name="t9_map_row_8">8tuvшщъ</string>
    <string name="t9_map_row_8">8tuvшщъ</string>
    <string name="t9_map_row_9">9wxyzьюя</string>
    <string name="t9_map_row_9">9wxyzьюя</string>

    <string name="date_year_toggle" msgid="7356532842767854606">"Въвеждане на година"</string>
    <string name="date_format_short_no_year">dd.MM.</string>
    <string name="date_format_full_no_year">d MMMM</string>
</resources>
</resources>
+3 −0
Original line number Original line Diff line number Diff line
@@ -389,4 +389,7 @@
    <string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"Torna a provar d\'actualitzar"</string>
    <string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"Torna a provar d\'actualitzar"</string>
    <string name="search_results_for" msgid="8705490885073188513">"Resultats de la cerca per a: <xliff:g id="QUERY">%s</xliff:g>"</string>
    <string name="search_results_for" msgid="8705490885073188513">"Resultats de la cerca per a: <xliff:g id="QUERY">%s</xliff:g>"</string>
    <string name="search_results_searching" msgid="7755623475227227314">"S\'està cercant..."</string>
    <string name="search_results_searching" msgid="7755623475227227314">"S\'està cercant..."</string>
    <string name="date_year_toggle" msgid="7356532842767854606">"Indica un any"</string>
    <string name="date_format_short_no_year">dd/MM</string>
    <string name="date_format_full_no_year">d MMMM</string>
</resources>
</resources>
Loading