Merge "Move secondary call information to the bottom, clear call context."... (dd5274dc) · Commits · e / os / android_packages_apps_Dialer

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

+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;

+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);
		}
		}