Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 107c7da5 authored by Nancy Chen's avatar Nancy Chen
Browse files

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
parent a1bccb17

InCallUI/res/layout/call_card_fragment.xml

+124 −120
Original line number Diff line number Diff line
@@ -16,7 +16,10 @@ 
  ~ limitations under the License

  -->



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical">
@@ -123,8 +126,6 @@ 


            </FrameLayout>



        <!-- Secondary "Call info" block, for the background ("on hold") call. -->

        <include layout="@layout/secondary_call_info" />



            <include layout="@layout/manage_conference_call_button"

                android:layout_width="match_parent"
@@ -160,3 +161,6 @@ 
        </FrameLayout>



    </LinearLayout>

    <!-- Secondary "Call info" block, for the background ("on hold") call. -->

    <include layout="@layout/secondary_call_info" />

</RelativeLayout>
 
 No newline at end of file

InCallUI/src/com/android/incallui/CallCardFragment.java

+0 −2
Original line number Diff line number Diff line
@@ -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;

InCallUI/src/com/android/incallui/CallCardPresenter.java

+2 −0
Original line number Diff line number Diff line
@@ -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);

        }

    }