diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-03-27 14:52:00 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-27 14:52:00 -0700 |
| commit | b16d06ab3df1367d597134bf5b02c966bc9d0a84 (patch) | |
| tree | 7e6fd869459ac6454c9c2c1488966549ba976592 | |
| parent | 36835138ac3bb3a167b0950a929788aee6d9fb7e (diff) | |
| parent | c0fcf9b4e1c0e503fc84d03ceb3b1d27dffbadfc (diff) | |
| download | android_packages_apps_Dialer-b16d06ab3df1367d597134bf5b02c966bc9d0a84.tar.gz android_packages_apps_Dialer-b16d06ab3df1367d597134bf5b02c966bc9d0a84.tar.bz2 android_packages_apps_Dialer-b16d06ab3df1367d597134bf5b02c966bc9d0a84.zip | |
Merge "Dialer: Only when the phone state is idle, hide the dialpad chooser"
| -rwxr-xr-x | src/com/android/dialer/dialpad/DialpadFragment.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java index f1b22b855..9650a1fd8 100755 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -2056,12 +2056,14 @@ public class DialpadFragment extends AnalyticsFragment PhoneStateListener phoneStateListener = new PhoneStateListener(subId[0]) { @Override public void onCallStateChanged(int state, String incomingNumber) { - if ((state == TelephonyManager.CALL_STATE_IDLE) + if ((getActivity() != null) && + (getTelephonyManager().getCallState() == TelephonyManager.CALL_STATE_IDLE) && isDialpadChooserVisible()) { showDialpadChooser(false); } - if (state == TelephonyManager.CALL_STATE_IDLE - && getActivity() != null) { + if ((getActivity() != null) + && (getTelephonyManager().getCallState() + == TelephonyManager.CALL_STATE_IDLE)) { ((HostInterface) getActivity()).setConferenceDialButtonVisibility(true); } } |