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

Commit f5808415 authored by Fred Quintana's avatar Fred Quintana
Browse files

rename misc to birthday

parent 4579ed28

api/current.xml

+31 −31
Original line number Diff line number Diff line
@@ -113131,6 +113131,37 @@ 
>

</field>

</interface>

<class name="ContactsContract.CommonDataKinds.Birthday"

 extends="java.lang.Object"

 abstract="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

<field name="BIRTHDAY"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;data1&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="CONTENT_ITEM_TYPE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;vnd.android.cursor.item/birthday&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="ContactsContract.CommonDataKinds.Email"

 extends="java.lang.Object"

 abstract="false"
@@ -113617,37 +113648,6 @@ 
>

</field>

</class>

<class name="ContactsContract.CommonDataKinds.Miscellaneous"

 extends="java.lang.Object"

 abstract="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

<field name="BIRTHDAY"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;data1&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="CONTENT_ITEM_TYPE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;vnd.android.cursor.item/misc&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="ContactsContract.CommonDataKinds.Nickname"

 extends="java.lang.Object"

 abstract="false"

core/java/android/pim/vcard/ContactStruct.java

+4 −5
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package android.pim.vcard; 
import android.accounts.Account;

import android.content.ContentProviderOperation;

import android.content.ContentResolver;

import android.content.ContentValues;

import android.content.OperationApplicationException;

import android.database.Cursor;

import android.os.RemoteException;
@@ -26,10 +25,10 @@ import android.provider.ContactsContract; 
import android.provider.ContactsContract.Data;

import android.provider.ContactsContract.Groups;

import android.provider.ContactsContract.RawContacts;

import android.provider.ContactsContract.CommonDataKinds.Birthday;

import android.provider.ContactsContract.CommonDataKinds.Email;

import android.provider.ContactsContract.CommonDataKinds.GroupMembership;

import android.provider.ContactsContract.CommonDataKinds.Im;

import android.provider.ContactsContract.CommonDataKinds.Miscellaneous;

import android.provider.ContactsContract.CommonDataKinds.Nickname;

import android.provider.ContactsContract.CommonDataKinds.Note;

import android.provider.ContactsContract.CommonDataKinds.Organization;
@@ -1317,9 +1316,9 @@ public class ContactStruct { 
        

        if (!TextUtils.isEmpty(mBirthday)) {

            builder = ContentProviderOperation.newInsert(Data.CONTENT_URI);

            builder.withValueBackReference(Miscellaneous.RAW_CONTACT_ID, 0);

            builder.withValue(Data.MIMETYPE, Miscellaneous.CONTENT_ITEM_TYPE);

            builder.withValue(Miscellaneous.BIRTHDAY, mBirthday);

            builder.withValueBackReference(Birthday.RAW_CONTACT_ID, 0);

            builder.withValue(Data.MIMETYPE, Birthday.CONTENT_ITEM_TYPE);

            builder.withValue(Birthday.BIRTHDAY, mBirthday);

            operationList.add(builder.build());

        }

core/java/android/pim/vcard/VCardComposer.java

+7 −4
Original line number Diff line number Diff line 
/*

*

 * Copyright (C) 2009 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -31,7 +31,7 @@ import android.provider.ContactsContract.Data; 
import android.provider.ContactsContract.RawContacts;

import android.provider.ContactsContract.CommonDataKinds.Email;

import android.provider.ContactsContract.CommonDataKinds.Im;

import android.provider.ContactsContract.CommonDataKinds.Miscellaneous;

import android.provider.ContactsContract.CommonDataKinds.Birthday;

import android.provider.ContactsContract.CommonDataKinds.Nickname;

import android.provider.ContactsContract.CommonDataKinds.Note;

import android.provider.ContactsContract.CommonDataKinds.Organization;
@@ -40,6 +40,9 @@ import android.provider.ContactsContract.CommonDataKinds.Photo; 
import android.provider.ContactsContract.CommonDataKinds.StructuredName;

import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;

import android.provider.ContactsContract.CommonDataKinds.Website;

import android.provider.CallLog.Calls;

import android.provider.CallLog;

import android.text.format.Time;

import android.text.TextUtils;

import android.text.format.Time;

import android.util.CharsetUtils;
@@ -1095,12 +1098,12 @@ public class VCardComposer { 
    private void appendBirthday(final StringBuilder builder,

            final Map<String, List<ContentValues>> contentValuesListMap) {

        final List<ContentValues> contentValuesList = contentValuesListMap

                .get(Miscellaneous.CONTENT_ITEM_TYPE);

                .get(Birthday.CONTENT_ITEM_TYPE);

        if (contentValuesList != null && contentValuesList.size() > 0) {

            // Theoretically, there must be only one birthday for each vCard data and

            // we are afraid of some parse error occuring in some devices, so

            // we emit only one birthday entry for now.

            final String birthday = contentValuesList.get(0).getAsString(Miscellaneous.BIRTHDAY);

            final String birthday = contentValuesList.get(0).getAsString(Birthday.BIRTHDAY);

            appendVCardLine(builder, VCARD_PROPERTY_BIRTHDAY, birthday);

        }

    }

core/java/android/provider/ContactsContract.java

+6 −5
Original line number Diff line number Diff line
@@ -1639,19 +1639,20 @@ public final class ContactsContract { 
        }



        /**

         * Common data definition for miscellaneous information.

         * Common data definition for birthdays.

         */

        public static final class Miscellaneous implements DataColumnsWithJoins {

        public static final class Birthday implements DataColumnsWithJoins {

            /**

             * This utility class cannot be instantiated

             */

            private Miscellaneous() {}

            private Birthday() {}



            /** MIME type used when storing this in data table. */

            public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/misc";

            public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/birthday";



            /**

             * The birthday as the user entered it.

             * The birthday. This must be of the form YYYY-MM-DD or YYYY-MM-DDThh:mm:ss

             * These are xs:date and xs:dateTime

             * <P>Type: TEXT</P>

             */

            public static final String BIRTHDAY = DATA1;