commit b5f10d3dab09850fefce6d85f1e9d73f66cde5c3
author Andrew Lee <anwlee@google.com> Mon Jun 23 21:01:53 2014 +0000
committer Andrew Lee <anwlee@google.com> Mon Jun 23 21:01:53 2014 +0000
tree 2cb93329244970f5c8fbaa314a4c602adb25a680
parent 1f432a644a930688addec25bf406b3b1df08a6d3

Revert "Hide the dialpad fragment onResume after dialing."

This reverts commit 1f432a644a930688addec25bf406b3b1df08a6d3.

Change-Id: I21844fdfcde3e7864d01f3dbe1b171864023975e

src/com/android/dialer/DialtactsActivity.java

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 2b2be2d..8e873c8 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -131,7 +131,6 @@
     private static final String KEY_IN_DIALPAD_SEARCH_UI = "in_dialpad_search_ui";
     private static final String KEY_SEARCH_QUERY = "search_query";
     private static final String KEY_FIRST_LAUNCH = "first_launch";
-    private static final String KEY_HIDE_DIALPAD = "hide_dialpad";
     private static final String KEY_IS_DIALPAD_SHOWN = "is_dialpad_shown";
 
     private static final String TAG_DIALPAD_FRAGMENT = "dialpad";
@@ -193,7 +192,6 @@
     private boolean mClearSearchOnPause;
     private boolean mIsDialpadShown;
     private boolean mShowDialpadOnResume;
-    private boolean mHideDialpadOnResume;
 
     /**
      * Whether or not the device is in landscape orientation.
@@ -425,7 +423,6 @@
             mInRegularSearch = savedInstanceState.getBoolean(KEY_IN_REGULAR_SEARCH_UI);
             mInDialpadSearch = savedInstanceState.getBoolean(KEY_IN_DIALPAD_SEARCH_UI);
             mFirstLaunch = savedInstanceState.getBoolean(KEY_FIRST_LAUNCH);
-            mHideDialpadOnResume = savedInstanceState.getBoolean(KEY_HIDE_DIALPAD);
             mShowDialpadOnResume = savedInstanceState.getBoolean(KEY_IS_DIALPAD_SHOWN);
             mActionBarController.restoreInstanceState(savedInstanceState);
         }
@@ -483,8 +480,6 @@
         } else if (!phoneIsInUse() && mInCallDialpadUp) {
             hideDialpadFragment(false, true);
             mInCallDialpadUp = false;
-        } else if (mHideDialpadOnResume) {
-            hideDialpadFragment(false, true);
         } else if (mShowDialpadOnResume) {
             showDialpadFragment(false);
             mShowDialpadOnResume = false;
@@ -511,7 +506,6 @@
         outState.putBoolean(KEY_IN_REGULAR_SEARCH_UI, mInRegularSearch);
         outState.putBoolean(KEY_IN_DIALPAD_SEARCH_UI, mInDialpadSearch);
         outState.putBoolean(KEY_FIRST_LAUNCH, mFirstLaunch);
-        outState.putBoolean(KEY_HIDE_DIALPAD, mHideDialpadOnResume);
         outState.putBoolean(KEY_IS_DIALPAD_SHOWN, mIsDialpadShown);
         mActionBarController.saveInstanceState(outState);
     }
@@ -556,7 +550,6 @@
                 } else {
                     // Dial button was pressed; tell the Dialpad fragment
                     mDialpadFragment.dialButtonPressed();
-                    mHideDialpadOnResume = true;
                 }
                 break;
             case R.id.voice_search_button:

src/com/android/dialer/dialpad/DialpadFragment.java

diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index ddf6ba9..f54aa6c 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -1076,6 +1076,7 @@
                         (getActivity() instanceof DialtactsActivity ?
                                 ((DialtactsActivity) getActivity()).getCallOrigin() : null));
                 DialerUtils.startActivityWithErrorToast(getActivity(), intent);
+                hideAndClearDialpad(false);
             }
         }
     }