diff options
| author | Richard MacGregor <rmacgregor@cyngn.com> | 2016-03-03 15:29:55 -0800 |
|---|---|---|
| committer | Stephen Bird <sbird@cyngn.com> | 2016-04-08 10:21:10 -0700 |
| commit | 848c314c3e98a7ed2bc29bbef6bd5bd8cbd71a28 (patch) | |
| tree | a4ba411b6d8ffd4d2c2802d9834f5452d7f9ea70 | |
| parent | ee66a85baa3f751e21700775a878c6de54b4a3ff (diff) | |
| download | android_packages_apps_Dialer-848c314c3e98a7ed2bc29bbef6bd5bd8cbd71a28.tar.gz android_packages_apps_Dialer-848c314c3e98a7ed2bc29bbef6bd5bd8cbd71a28.tar.bz2 android_packages_apps_Dialer-848c314c3e98a7ed2bc29bbef6bd5bd8cbd71a28.zip | |
Show credit banner if supported in dialpad and search ui
Ticket CD-416
Change-Id: I923f68e8d8d310cf5f4200523392a83f1a55dcee
| -rw-r--r-- | src/com/android/dialer/list/SearchFragment.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/dialer/list/SearchFragment.java b/src/com/android/dialer/list/SearchFragment.java index e0e404d56..9b40d5135 100644 --- a/src/com/android/dialer/list/SearchFragment.java +++ b/src/com/android/dialer/list/SearchFragment.java @@ -273,7 +273,12 @@ public class SearchFragment extends PhoneNumberPickerFragment public void onResume() { super.onResume(); - updateCallCreditInfo(); + final DialtactsActivity da = (DialtactsActivity) getActivity(); + if (mCurrentCallMethodInfo == null && da != null && da.isInSearchUi()) { + setCurrentCallMethod(da.getCurrentCallMethod()); + } else { + updateCallCreditInfo(); + } } @Override @@ -353,7 +358,7 @@ public class SearchFragment extends PhoneNumberPickerFragment } public void setCurrentCallMethod(CallMethodInfo cmi) { - if (!cmi.equals(mCurrentCallMethodInfo)) { + if (cmi != null && !cmi.equals(mCurrentCallMethodInfo)) { mCurrentCallMethodInfo = cmi; setupEmptyView(); final DialerPhoneNumberListAdapter adapter = (DialerPhoneNumberListAdapter) getAdapter(); |