diff options
| author | Nancy Chen <nancychen@google.com> | 2015-11-13 14:41:06 -0800 |
|---|---|---|
| committer | Nancy Chen <nancychen@google.com> | 2015-11-13 14:41:06 -0800 |
| commit | 107c7da5da4e689b38433756244971d7543f7272 (patch) | |
| tree | aea3d9f2fc6583ebe375c366bc929a8420b3f741 /InCallUI/src/com/android/incallui | |
| parent | a1bccb179974a821a989b459326b182cd07b772e (diff) | |
Move secondary call information to the bottom, clear call context.
The secondary call information was obscuring the call context info
because it was incorrectly being placed right under the primary call
info. This is a bug because it should placed under the FAB at the bottom
of the screen.
Also hide the call context info when a new call comes in that does not
have caller contex.
Bug: 25222360
Change-Id: I7601ce7e7e2609ac046ea104651ac50d863a86bc
Diffstat (limited to 'InCallUI/src/com/android/incallui')
| -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 28311c9d6..bccde6eb1 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); } } |