diff options
| -rw-r--r-- | src/com/android/mail/ui/AbstractActivityController.java | 3 | ||||
| -rw-r--r-- | src/com/android/mail/ui/ConversationViewFragment.java | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java index d5122ae97..88c016754 100644 --- a/src/com/android/mail/ui/AbstractActivityController.java +++ b/src/com/android/mail/ui/AbstractActivityController.java @@ -4410,13 +4410,14 @@ public abstract class AbstractActivityController implements ActivityController, if (slideOffset > 0.15f) { mDrawerToggle.setDrawerIndicatorEnabled(true /* enable */); } else { - if (mOldSlideOffset < slideOffset) { + if (mOldSlideOffset < slideOffset || (slideOffset == 0f && mOldSlideOffset > 0f)) { final int mode = mViewMode.getMode(); final boolean isTopLevel = Folder.isRoot(mFolder); mDrawerToggle.setDrawerIndicatorEnabled( getShouldShowDrawerIndicator(mode, isTopLevel)); } } + mDrawerContainer.clearFocus(); mOldSlideOffset = slideOffset; diff --git a/src/com/android/mail/ui/ConversationViewFragment.java b/src/com/android/mail/ui/ConversationViewFragment.java index d3c7600aa..519196ec5 100644 --- a/src/com/android/mail/ui/ConversationViewFragment.java +++ b/src/com/android/mail/ui/ConversationViewFragment.java @@ -1212,10 +1212,7 @@ public class ConversationViewFragment extends AbstractConversationViewFragment i // Finally we handle the special keys if (keyCode == KeyEvent.KEYCODE_BACK && id != R.id.conversation_topmost_overlay) { - if (isActionUp) { - mTopmostOverlay.requestFocus(); - } - return true; + return mTopmostOverlay.requestFocus(); } else if (keyCode == KeyEvent.KEYCODE_ENTER && id == R.id.conversation_topmost_overlay) { if (isActionUp) { |