diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-10-26 18:11:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-26 18:11:22 +0000 |
| commit | 9b99b22391a92fe20a74076bf5e47d36eb9b4ab4 (patch) | |
| tree | 510aa70e1d1421be75f8f5cea57a6fce51427cbc /java/com/android/dialer/app/DialtactsActivity.java | |
| parent | e5041c35b4c0ef31e5d242a8dd61d7441d490f44 (diff) | |
| parent | 65c21801bf47cf24e2755445545bedabc0f393bf (diff) | |
Merge changes I1fa267c0,Ia6812794,Ib5715d0f,I71d4c03b
* changes:
Cp2 Phonelookup isDirty implementation.
App latency test migration. Migrate the existing app latency test to a new solution from Project Fi team. The main change on this new solution is that the data collection part is done by Primes now.
Search fragment now closes after placing a call.
Display CDMA voice privacy icon on notification bar.
Diffstat (limited to 'java/com/android/dialer/app/DialtactsActivity.java')
| -rw-r--r-- | java/com/android/dialer/app/DialtactsActivity.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/java/com/android/dialer/app/DialtactsActivity.java b/java/com/android/dialer/app/DialtactsActivity.java index b9ca67f62..b5ec20246 100644 --- a/java/com/android/dialer/app/DialtactsActivity.java +++ b/java/com/android/dialer/app/DialtactsActivity.java @@ -124,7 +124,7 @@ import com.android.dialer.performancereport.PerformanceReport; import com.android.dialer.postcall.PostCall; import com.android.dialer.proguard.UsedByReflection; import com.android.dialer.searchfragment.list.NewSearchFragment; -import com.android.dialer.searchfragment.list.NewSearchFragment.SearchFragmentListTouchListener; +import com.android.dialer.searchfragment.list.NewSearchFragment.SearchFragmentListener; import com.android.dialer.simulator.Simulator; import com.android.dialer.simulator.SimulatorComponent; import com.android.dialer.smartdial.SmartDialNameMatcher; @@ -164,7 +164,7 @@ public class DialtactsActivity extends TransactionSafeActivity PhoneNumberInteraction.DisambigDialogDismissedListener, ActivityCompat.OnRequestPermissionsResultCallback, DialpadListener, - SearchFragmentListTouchListener { + SearchFragmentListener { public static final boolean DEBUG = false; @VisibleForTesting public static final String TAG_DIALPAD_FRAGMENT = "dialpad"; @@ -1664,6 +1664,14 @@ public class DialtactsActivity extends TransactionSafeActivity return false; } + @Override + public void onCallPlaced() { + if (mIsDialpadShown) { + hideDialpadFragment(false, true); + } + exitSearchUi(); + } + /** Popup menu accessible from the search bar */ protected class OptionsPopupMenu extends PopupMenu { |