Remove presence from conversation view.
Fixes b/9892710 by removing presence indicators.
Huzzah.
Change-Id: I9f6ae5254ab624eeb9ffcb61ad7d47c5649d66e6
diff --git a/res/layout/conversation_message_upper_header_text.xml b/res/layout/conversation_message_upper_header_text.xml
index dc695d7..90d652a 100644
--- a/res/layout/conversation_message_upper_header_text.xml
+++ b/res/layout/conversation_message_upper_header_text.xml
@@ -57,30 +57,28 @@
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
style="@style/MessageSenderNameStyle" />
- <ImageView
- android:id="@+id/presence"
- android:layout_below="@id/sender_name"
- style="@style/MessageHeaderPresenceStyle" />
<TextView
android:id="@+id/sender_email"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/sender_name"
- android:layout_toEndOf="@id/presence"
- android:layout_toRightOf="@id/presence"
+ android:layout_alignParentStart="true"
+ android:layout_alignParentLeft="true"
style="@style/MessageHeaderSubtitleStyle" />
<TextView
android:id="@+id/send_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/sender_email"
- android:layout_toEndOf="@id/presence"
- android:layout_toRightOf="@id/presence"
+ android:layout_alignParentStart="true"
+ android:layout_alignParentLeft="true"
style="@style/MessageHeaderSubtitleStyle" />
<TextView
android:id="@+id/email_snippet"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/sender_name"
+ android:layout_alignParentStart="true"
+ android:layout_alignParentLeft="true"
style="@style/MessageHeaderSnippetStyle" />
</RelativeLayout>
diff --git a/src/com/android/mail/browse/MessageHeaderView.java b/src/com/android/mail/browse/MessageHeaderView.java
index 8b0dda1..11fb46e 100644
--- a/src/com/android/mail/browse/MessageHeaderView.java
+++ b/src/com/android/mail/browse/MessageHeaderView.java
@@ -25,7 +25,6 @@
import android.graphics.Bitmap;
import android.graphics.Typeface;
import android.os.Build;
-import android.provider.ContactsContract;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
@@ -55,7 +54,6 @@
import com.android.mail.compose.ComposeActivity;
import com.android.mail.perf.Timer;
import com.android.mail.photomanager.LetterTileProvider;
-import com.android.mail.preferences.MailPrefs;
import com.android.mail.providers.Account;
import com.android.mail.providers.Address;
import com.android.mail.providers.Conversation;
@@ -121,7 +119,6 @@
private SpamWarningView mSpamWarningView;
private TextView mImagePromptView;
private MessageInviteView mInviteView;
- private ImageView mPresenceView;
private View mForwardButton;
private View mOverflowButton;
private View mDraftIcon;
@@ -280,7 +277,6 @@
mReplyAllButton = findViewById(R.id.reply_all);
mForwardButton = findViewById(R.id.forward);
mStarView = (ImageView) findViewById(R.id.star);
- mPresenceView = (ImageView) findViewById(R.id.presence);
mTitleContainerView = (ViewGroup) findViewById(R.id.title_container);
mOverflowButton = findViewById(R.id.overflow);
mDraftIcon = findViewById(R.id.draft);
@@ -794,9 +790,6 @@
}
private void updateContactInfo() {
-
- mPresenceView.setImageDrawable(null);
- mPresenceView.setVisibility(GONE);
if (mContactInfoSource == null || mSender == null) {
mPhotoView.setImageToDefault();
mPhotoView.setContentDescription(getResources().getString(
@@ -817,14 +810,8 @@
mPhotoView.assignContactUri(info.contactUri);
if (info.photo != null) {
mPhotoView.setImageBitmap(info.photo);
- contentDesc = String.format(contentDesc, mSender.getName());
photoSet = true;
}
- if (!mIsDraft && info.status != null) {
- mPresenceView.setImageResource(ContactsContract.StatusUpdates
- .getPresenceIconResourceId(info.status));
- mPresenceView.setVisibility(VISIBLE);
- }
} else {
mPhotoView.assignContactFromEmail(email, true /* lazyLookup */);
}