diff options
| author | Evan Charlton <evanc@google.com> | 2014-05-09 21:18:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-09 21:18:26 +0000 |
| commit | 0b5d65f4eeb0d450a83284cbed6580b022213bad (patch) | |
| tree | 14dbbd21be6f36e8a349c21ce15afc66f776f304 /InCallUI/res/layout/call_card.xml | |
| parent | 1f207741a8796fbefe5949be4caf15305bfc8006 (diff) | |
| parent | 09bbf1595013b3d871230c368d26d577f60a0b8a (diff) | |
Merge "Re-add network indicator/handoff button" into master-nova
Diffstat (limited to 'InCallUI/res/layout/call_card.xml')
| -rw-r--r-- | InCallUI/res/layout/call_card.xml | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/InCallUI/res/layout/call_card.xml b/InCallUI/res/layout/call_card.xml index 6a06cabd0..8b54ad6b9 100644 --- a/InCallUI/res/layout/call_card.xml +++ b/InCallUI/res/layout/call_card.xml @@ -91,17 +91,33 @@ </LinearLayout> <FrameLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="bottom|center"> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom|center"> <ImageButton android:id="@+id/endButton" - android:layout_width="@dimen/floating_action_button_width" - android:layout_height="@dimen/floating_action_button_height" - android:layout_marginBottom="@dimen/end_call_button_margin_bottom" - android:background="@drawable/floating_end_button_compound_background" - android:src="@drawable/ic_in_call_phone_hangup" - android:contentDescription="@string/onscreenEndCallText" /> + android:layout_width="@dimen/floating_action_button_width" + android:layout_height="@dimen/floating_action_button_height" + android:layout_marginBottom="@dimen/end_call_button_margin_bottom" + android:background="@drawable/floating_end_button_compound_background" + android:src="@drawable/ic_in_call_phone_hangup" + android:contentDescription="@string/onscreenEndCallText" /> + + </FrameLayout> + + <!-- Insert a CallService indicator (which controls handoff, too) --> + <FrameLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom|right"> + + <ImageButton android:id="@+id/handoffButton" + android:enabled="false" + android:layout_width="@dimen/floating_action_button_width" + android:layout_height="@dimen/floating_action_button_height" + android:layout_marginBottom="@dimen/end_call_button_margin_bottom" + android:background="@drawable/floating_handoff_button_compound_background" + android:src="@drawable/ic_in_call_pstn" /> </FrameLayout> |