diff options
author | Nancy Chen <nancychen@google.com> | 2015-11-16 18:29:50 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-11-16 18:29:50 +0000 |
commit | 0642dfeadfc31b2c84b62bbddfd00c53fccda4b6 (patch) | |
tree | 6b6ce241224f96395e710d287ac90eea4893cbfc /InCallUI/src/com/android | |
parent | 505fb6c83333c830d1d5000eef8c901c6fc85cbb (diff) | |
parent | dd5274dcc2370154015f250257b94e696bbc2ef8 (diff) |
Merge "Move secondary call information to the bottom, clear call context." into ub-contactsdialer-a-dev
am: a9304a57fd
* commit 'a9304a57fda8781fa951cc4da7d788b627fb8d84':
Move secondary call information to the bottom, clear call context.
Diffstat (limited to 'InCallUI/src/com/android')
-rw-r--r-- | InCallUI/src/com/android/incallui/CallCardFragment.java | 2 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index 0d635543c..75d13535b 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -184,8 +184,6 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr private boolean mCallStateLabelResetPending = false; private Handler mHandler; - private InCallContactInteractions mInCallContactInteractions; - @Override public CallCardPresenter.CallCardUi getUi() { return this; diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index 58722a185..ba5823d5a 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -608,6 +608,8 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> mPrimaryContactInfo.openingHours); getUi().setContactContextContent(mInCallContactInteractions.getListAdapter()); getUi().showContactContext(mPrimary.getState() != State.INCOMING); + } else { + getUi().showContactContext(false); } } |