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

Commit bde0716d authored by Jeff Hamilton's avatar Jeff Hamilton
Browse files

resolved conflicts for merge of 08ace2e0 to master

parents 0f51324c 08ace2e0

api/current.xml

+188 −1
Original line number Diff line number Diff line
@@ -127627,6 +127627,50 @@ 
 deprecated="deprecated"

 visibility="public"

>

<field name="AVAILABLE"

 type="int"

 transient="false"

 volatile="false"

 value="5"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="AWAY"

 type="int"

 transient="false"

 volatile="false"

 value="2"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="DO_NOT_DISTURB"

 type="int"

 transient="false"

 volatile="false"

 value="4"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="IDLE"

 type="int"

 transient="false"

 volatile="false"

 value="3"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="IM_ACCOUNT"

 type="java.lang.String"

 transient="false"
@@ -127660,6 +127704,61 @@ 
 visibility="public"

>

</field>

<field name="INVISIBLE"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="OFFLINE"

 type="int"

 transient="false"

 volatile="false"

 value="0"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="PRESENCE_CUSTOM_STATUS"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;status&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="PRESENCE_STATUS"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;mode&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="PRIORITY"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;priority&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</interface>

<class name="Contacts.Settings"

 extends="java.lang.Object"
@@ -131878,6 +131977,72 @@ 
 deprecated="not deprecated"

 visibility="protected"

>

<field name="AVAILABLE"

 type="int"

 transient="false"

 volatile="false"

 value="5"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="AWAY"

 type="int"

 transient="false"

 volatile="false"

 value="2"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="DO_NOT_DISTURB"

 type="int"

 transient="false"

 volatile="false"

 value="4"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="IDLE"

 type="int"

 transient="false"

 volatile="false"

 value="3"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INVISIBLE"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="OFFLINE"

 type="int"

 transient="false"

 volatile="false"

 value="0"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="PRESENCE"

 type="java.lang.String"

 transient="false"
@@ -131889,6 +132054,28 @@ 
 visibility="public"

>

</field>

<field name="PRESENCE_CUSTOM_STATUS"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;status&quot;"

 static="true"

 final="true"

 deprecated="deprecated"

 visibility="public"

>

</field>

<field name="PRESENCE_STATUS"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;mode&quot;"

 static="true"

 final="true"

 deprecated="deprecated"

 visibility="public"

>

</field>

<field name="STATUS"

 type="java.lang.String"

 transient="false"
@@ -212754,7 +212941,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="t" type="T">

<parameter name="arg0" type="T">

</parameter>

</method>

</interface>

core/java/android/provider/Contacts.java

+56 −10
Original line number Diff line number Diff line
@@ -1333,9 +1333,27 @@ public class Contacts { 
                    "the value is not a valid encoded protocol, " + encodedString);

        }



        /**

         * TODO find a place to put the canonical version of these.

         */

        interface ProviderNames {

            //

            //NOTE: update Contacts.java with new providers when they're added.

            //

            String YAHOO = "Yahoo";

            String GTALK = "GTalk";

            String MSN = "MSN";

            String ICQ = "ICQ";

            String AIM = "AIM";

            String XMPP = "XMPP";

            String JABBER = "JABBER";

            String SKYPE = "SKYPE";

            String QQ = "QQ";

        }



        /**

         * This looks up the provider name defined in

         * {@link android.provider.Im.ProviderNames} from the predefined IM protocol id.

         * from the predefined IM protocol id.

         * This is used for interacting with the IM application.

         *

         * @param protocol the protocol ID
@@ -1348,21 +1366,21 @@ public class Contacts { 
        public static String lookupProviderNameFromId(int protocol) {

            switch (protocol) {

                case PROTOCOL_GOOGLE_TALK:

                    return Im.ProviderNames.GTALK;

                    return ProviderNames.GTALK;

                case PROTOCOL_AIM:

                    return Im.ProviderNames.AIM;

                    return ProviderNames.AIM;

                case PROTOCOL_MSN:

                    return Im.ProviderNames.MSN;

                    return ProviderNames.MSN;

                case PROTOCOL_YAHOO:

                    return Im.ProviderNames.YAHOO;

                    return ProviderNames.YAHOO;

                case PROTOCOL_ICQ:

                    return Im.ProviderNames.ICQ;

                    return ProviderNames.ICQ;

                case PROTOCOL_JABBER:

                    return Im.ProviderNames.JABBER;

                    return ProviderNames.JABBER;

                case PROTOCOL_SKYPE:

                    return Im.ProviderNames.SKYPE;

                    return ProviderNames.SKYPE;

                case PROTOCOL_QQ:

                    return Im.ProviderNames.QQ;

                    return ProviderNames.QQ;

            }

            return null;

        }
@@ -1532,7 +1550,35 @@ public class Contacts { 
     * @deprecated see {@link android.provider.ContactsContract}

     */

    @Deprecated

    public interface PresenceColumns extends Im.CommonPresenceColumns {

    public interface PresenceColumns {

        /**

         * The priority, an integer, used by XMPP presence

         * <P>Type: INTEGER</P>

         */

        String PRIORITY = "priority";



        /**

         * The server defined status.

         * <P>Type: INTEGER (one of the values below)</P>

         */

        String PRESENCE_STATUS = ContactsContract.StatusUpdates.PRESENCE;



        /**

         * Presence Status definition

         */

        int OFFLINE = ContactsContract.StatusUpdates.OFFLINE;

        int INVISIBLE = ContactsContract.StatusUpdates.INVISIBLE;

        int AWAY = ContactsContract.StatusUpdates.AWAY;

        int IDLE = ContactsContract.StatusUpdates.IDLE;

        int DO_NOT_DISTURB = ContactsContract.StatusUpdates.DO_NOT_DISTURB;

        int AVAILABLE = ContactsContract.StatusUpdates.AVAILABLE;



        /**

         * The user defined status line.

         * <P>Type: TEXT</P>

         */

        String PRESENCE_CUSTOM_STATUS = ContactsContract.StatusUpdates.STATUS;



        /**

         * The IM service the presence is coming from. Formatted using either

         * {@link Contacts.ContactMethods#encodePredefinedImProtocol} or

core/java/android/provider/ContactsContract.java

+24 −3
Original line number Diff line number Diff line
@@ -1601,18 +1601,39 @@ public final class ContactsContract { 
     * @see StatusUpdates

     * @see ContactsContract.Data

     */

    protected interface StatusColumns extends Im.CommonPresenceColumns {

    protected interface StatusColumns {

        /**

         * Contact's latest presence level.

         * <P>Type: INTEGER (one of the values below)</P>

         */

        public static final String PRESENCE = PRESENCE_STATUS;

        public static final String PRESENCE = "mode";



        /**

         * @deprecated use {@link #PRESENCE}

         */

        @Deprecated

        public static final String PRESENCE_STATUS = PRESENCE;



        /*

         * Presence Status definition

         */

        int OFFLINE = 0;

        int INVISIBLE = 1;

        int AWAY = 2;

        int IDLE = 3;

        int DO_NOT_DISTURB = 4;

        int AVAILABLE = 5;



        /**

         * Contact latest status update.

         * <p>Type: TEXT</p>

         */

        public static final String STATUS = PRESENCE_CUSTOM_STATUS;

        public static final String STATUS = "status";



        /**

         * @deprecated use {@link #STATUS}

         */

        public static final String PRESENCE_CUSTOM_STATUS = STATUS;



        /**

         * The absolute time in milliseconds when the latest status was inserted/updated.

core/java/android/provider/Im.java

deleted100644 → 0
+0 −2358

File deleted.

Preview size limit exceeded, changes collapsed.