From ecb04568c80667ef052f76794f432c003ece13ab Mon Sep 17 00:00:00 2001
From: calderwoodra <calderwoodra@google.com>
Date: Sat, 16 Sep 2017 07:34:05 -0700
Subject: Pressing back when the dialpad is empty now exist the search UI.

Bug: 65687672
Test: existing
PiperOrigin-RevId: 168951800
Change-Id: Ie840acd608424551198ba3440d6060a7cd7a629f
---
 java/com/android/dialer/app/DialtactsActivity.java | 3 +++
 1 file changed, 3 insertions(+)

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);
-- 
cgit v1.2.3


From e92471f48c639337aea39a2c61073905ad7b8f0f Mon Sep 17 00:00:00 2001
From: calderwoodra <calderwoodra@google.com>
Date: Sat, 16 Sep 2017 21:35:49 -0700
Subject: Fixed crash when users press back twice in call composer.

Bug: 65686665
Test: manual
PiperOrigin-RevId: 168983351
Change-Id: I6443a05c8435e777c52ed3586dfc228a0fb0f51f
---
 java/com/android/dialer/callcomposer/CallComposerActivity.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.3