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

Less aggressive selection change in msg content. 

All focus changes to the message body content was pushing the selection
to the end, which is wrong if state restoration happens, and is just
non-standard behavior if the user explicitly taps on a particular spot
on the text view. Make this slightly less aggressive.

Misc other changes in compose view.

Bug: 3076256
Change-Id: I9edb9c3c4edb5ddec12207f4136f3ca73cabf89d
This commit is contained in:
Ben Komalo 2011-04-11 20:33:26 -07:00
parent 2577842269
commit 7dc1e86d91
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/email/Controller.java
View File

@ -661,7 +661,6 @@ public class Controller {
* IMAP and POP.
*
* @param mailboxId the mailbox
* @param callback
*/
public void loadMoreMessages(final long mailboxId) {
Utility.runAsync(new Runnable() {

20
src/com/android/email/activity/MessageCompose.java
View File

@ -594,7 +594,6 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
setFocusShifter(R.id.subject_label, R.id.subject);
setFocusShifter(R.id.tap_trap, R.id.message_content);
mSubjectView.setOnFocusChangeListener(this);
mMessageContentView.setOnFocusChangeListener(this);
updateAttachmentContainer();
@ -732,11 +731,20 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
}
}
@Override
public void onFocusChange(View view, boolean focused) {
if (focused) {
switch (view.getId()) {
case R.id.message_content:
setMessageContentSelection((mAccount != null) ? mAccount.mSignature : null);
// When focusing on the message content via tabbing to it, or other means of
// auto focusing, move the cursor to the end of the body (before the signature).
if (mMessageContentView.getSelectionStart() == 0
&& mMessageContentView.getSelectionEnd() == 0) {
// There is no way to determine if the focus change was programmatic or due
// to keyboard event, or if it was due to a tap/restore. Use a best-guess
// by using the fact that auto-focus/keyboard tabs set the selection to 0.
setMessageContentSelection((mAccount != null) ? mAccount.mSignature : null);
}
}
}
}
@ -1339,6 +1347,9 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
mMessageContentView.append("\n");
}
mMessageContentView.append(signature);
// Reset cursor to right before the signature.
mMessageContentView.setSelection(textLength);
}
}
@ -1617,11 +1628,9 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
}
/**
* Set a cursor to the end of a body except a signature
* Set a cursor to the end of a body except a signature.
*/
/* package */ void setMessageContentSelection(String signature) {
// when selecting the message content, explicitly move IP to the end of the message,
// so you can quickly resume typing into a draft
int selection = mMessageContentView.length();
if (!TextUtils.isEmpty(signature)) {
int signatureLength = signature.length();
@ -1659,7 +1668,6 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
mSubjectView.requestFocus();
} else {
mMessageContentView.requestFocus();
setMessageContentSelection((mAccount != null) ? mAccount.mSignature : null);
}
}
}