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

Commit 10a252e6 authored Jan 04, 2017 by cketti

Always show subject in message header when split mode is active

parent a56f12f1

k9mail/src/main/java/com/fsck/k9/activity/MessageList.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1435,6 +1435,8 @@ public class MessageList extends K9Activity implements MessageListFragmentListen
	public void displayMessageSubject(String subject) {		public void displayMessageSubject(String subject) {
	if (mDisplayMode == DisplayMode.MESSAGE_VIEW) {		if (mDisplayMode == DisplayMode.MESSAGE_VIEW) {
	mActionBarSubject.setText(subject);		mActionBarSubject.setText(subject);
			} else {
			mActionBarSubject.showSubjectInMessageHeader();
	}		}
	}		}

k9mail/src/main/java/com/fsck/k9/view/MessageTitleView.java

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -51,7 +51,7 @@ public class MessageTitleView extends TextView {
	if (getLayout().getLineCount() > MAX_LINES) {		if (getLayout().getLineCount() > MAX_LINES) {
	int lineEndIndex = getLayout().getLineEnd(MAX_LINES - 1);		int lineEndIndex = getLayout().getLineEnd(MAX_LINES - 1);
	setText(getText().subSequence(0, lineEndIndex - 2) + ELLIPSIS);		setText(getText().subSequence(0, lineEndIndex - 2) + ELLIPSIS);
	mHeader.showSubjectLine();		showSubjectInMessageHeader();
	}		}
	mNeedEllipsizeCheck = false;		mNeedEllipsizeCheck = false;
	}		}
	@@ -62,4 +62,8 @@ public class MessageTitleView extends TextView {
	public void setMessageHeader(final MessageHeader header) {		public void setMessageHeader(final MessageHeader header) {
	mHeader = header;		mHeader = header;
	}		}

			public void showSubjectInMessageHeader() {
			mHeader.showSubjectLine();
			}
	}		}