diff options
| author | calderwoodra <calderwoodra@google.com> | 2017-09-18 17:14:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-18 17:14:39 +0000 |
| commit | 74db30a6bfe36b9aabee6b4c3ce20875b01a459c (patch) | |
| tree | b4bc3b0df7cfcd55ce866ea1e2e49ab30d0276e8 | |
| parent | adc7bb8212312209eb170b63ceb6c52430c65a77 (diff) | |
| parent | 47929add9f0d24e71321f001b19dbee06c0f607a (diff) | |
Merge changes I6443a05c,Ie840acd6
am: 47929add9f
Change-Id: I8aac3201ddee0ef87738a310a12844725c8ef555
| -rw-r--r-- | java/com/android/dialer/app/DialtactsActivity.java | 3 | ||||
| -rw-r--r-- | java/com/android/dialer/callcomposer/CallComposerActivity.java | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/java/com/android/dialer/app/DialtactsActivity.java b/java/com/android/dialer/app/DialtactsActivity.java index 0b2f37505..588f9d77e 100644 --- a/java/com/android/dialer/app/DialtactsActivity.java +++ b/java/com/android/dialer/app/DialtactsActivity.java @@ -1291,6 +1291,9 @@ public class DialtactsActivity extends TransactionSafeActivity } if (mIsDialpadShown) { hideDialpadFragment(true, false); + if (TextUtils.isEmpty(mDialpadQuery)) { + exitSearchUi(); + } } else if (isInSearchUi()) { if (mIsKeyboardOpen) { DialerUtils.hideInputMethod(mParentLayout); diff --git a/java/com/android/dialer/callcomposer/CallComposerActivity.java b/java/com/android/dialer/callcomposer/CallComposerActivity.java index 4a6cdbbd8..b02e32543 100644 --- a/java/com/android/dialer/callcomposer/CallComposerActivity.java +++ b/java/com/android/dialer/callcomposer/CallComposerActivity.java @@ -157,6 +157,7 @@ public class CallComposerActivity extends AppCompatActivity private boolean inFullscreenMode; private boolean isSendAndCallHidingOrHidden = true; private boolean sendAndCallReady; + private boolean runningExitAnimation; private int currentIndex; public static Intent newIntent(Context context, DialerContact contact) { @@ -529,7 +530,7 @@ public class CallComposerActivity extends AppCompatActivity public void onBackPressed() { if (!isSendAndCallHidingOrHidden) { ((CallComposerFragment) adapter.instantiateItem(pager, currentIndex)).clearComposer(); - } else { + } else if (!runningExitAnimation) { // Unregister first to avoid receiving a callback when the session closes getEnrichedCallManager().unregisterStateChangedListener(this); getEnrichedCallManager().endCallComposerSession(sessionId); @@ -676,6 +677,7 @@ public class CallComposerActivity extends AppCompatActivity } else { contentAnimation.start(); } + runningExitAnimation = true; } @Override |