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

Commit 2b82ecf9 authored by Yorke Lee's avatar Yorke Lee
Browse files

Move ContactLoader related code to ContactsCommon 

This CL simply moves classes from Contacts into ContactsCommon.

This is needed so that Dialer can use ContactLoader related code
for b/11294679. A ContactLoader will also be needed in the future
to allow InCallUI to download hi-res photos while in call.

Bug: 11294679
Change-Id: If56a60aed2003ac7b8fcedac7ce4f1a7503bce94
parent 21b71078

res-common/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -720,4 +720,10 @@ a ren't members of any other group. [CHAR LIMIT=25] --> 
    -->

    <string name="description_dial_phone_number">Dial phone <xliff:g id="name">%1$s</xliff:g></string>



    <!-- Attribution of a contact status update, when the time of update is unknown -->

    <string name="contact_status_update_attribution">via <xliff:g id="source" example="Google Talk">%1$s</xliff:g></string>



    <!-- Attribution of a contact status update, when the time of update is known -->

    <string name="contact_status_update_attribution_with_date"><xliff:g id="date" example="3 hours ago">%1$s</xliff:g> via <xliff:g id="source" example="Google Talk">%2$s</xliff:g></string>



</resources>

src/com/android/contacts/common/model/dataitem/SipAddressDataItem.java

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 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.

 */



package com.android.contacts.common.model.dataitem;



import android.content.ContentValues;

import android.provider.ContactsContract;

import android.provider.ContactsContract.CommonDataKinds.SipAddress;



/**

 * Represents a sip address data item, wrapping the columns in

 * {@link ContactsContract.CommonDataKinds.SipAddress}.

 */

public class SipAddressDataItem extends DataItem {



    /* package */ SipAddressDataItem(ContentValues values) {

        super(values);

    }



    public String getSipAddress() {

        return getContentValues().getAsString(SipAddress.SIP_ADDRESS);

    }



    public String getLabel() {

        return getContentValues().getAsString(SipAddress.LABEL);

    }

}