ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 82d201b3: FastTrack->QuickContact

Browse Source 
Merge commit '82d201b33a7e8766977750285d6c0606c8d487cc' into eclair-plus-aosp

* commit '82d201b33a7e8766977750285d6c0606c8d487cc':
  FastTrack->QuickContact
This commit is contained in:
Evan Millar 2009-09-30 21:19:13 -07:00 committed by Android Git Automerger
commit d38d5d1438
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
res/drawable-hdpi/fasttrack_presence_bg.png → res/drawable-hdpi/quickcontact_presence_bg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1005 B

After

Width:  |  Height:  |  Size: 1005 B

0
res/drawable-mdpi/fasttrack_presence_bg.png → res/drawable-mdpi/quickcontact_presence_bg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 724 B

After

Width:  |  Height:  |  Size: 724 B

2
res/layout/message_view_header.xml
View File

@ -33,7 +33,7 @@
android:layout_height="wrap_content"
android:layout_marginRight="5dip"
android:baselineAlignBottom="true"
android:background="@drawable/fasttrack_presence_bg" />
android:background="@drawable/quickcontact_presence_bg" />
<TextView
android:id="@+id/from"
android:textAppearance="?android:attr/textAppearanceMedium"

8
src/com/android/email/activity/MessageView.java
View File

@ -55,7 +55,7 @@ import android.provider.Browser;
import android.provider.ContactsContract;
import android.provider.ContactsContract.CommonDataKinds;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.FastTrack;
import android.provider.ContactsContract.QuickContact;
import android.provider.ContactsContract.StatusUpdates;
import android.text.TextUtils;
import android.text.util.Regex;
@ -499,7 +499,7 @@ public class MessageView extends Activity implements OnClickListener {
}
/**
* Handle clicks on sender, which shows {@link FastTrack} or prompts to add
* Handle clicks on sender, which shows {@link QuickContact} or prompts to add
* the sender as a contact.
*/
private void onClickSender() {
@ -517,8 +517,8 @@ public class MessageView extends Activity implements OnClickListener {
final Uri lookupUri = ContactsContract.Data.getContactLookupUri(resolver, dataUri);
if (lookupUri != null) {
// Found matching contact, trigger FastTrack
FastTrack.showFastTrack(this, mSenderPresenceView, lookupUri, FastTrack.MODE_MEDIUM,
// Found matching contact, trigger QuickContact
QuickContact.showQuickContact(this, mSenderPresenceView, lookupUri, QuickContact.MODE_MEDIUM,
null);
} else {
// No matching contact, ask user to create one