summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2014-05-08 12:06:48 -0700
committerSteve Kondik <shade@chemlab.org>2014-05-08 12:40:49 -0700
commit598bad89b9ecb442547a60fc972d618f60e68195 (patch)
treeada2d8bee049d11410b6bd1014e4772c72e31066 /res/layout
parentcb900b3f3cb29abdad3668e16c42c716c94c8935 (diff)
parenta98d0462412bce476776081ce9d8daef41176527 (diff)
downloadpackages_apps_InCallUI-598bad89b9ecb442547a60fc972d618f60e68195.tar.gz
packages_apps_InCallUI-598bad89b9ecb442547a60fc972d618f60e68195.tar.bz2
packages_apps_InCallUI-598bad89b9ecb442547a60fc972d618f60e68195.zip
Merge branch 'LNX.LA.3.5.2.2.1_rb1' of git://codeaurora.org/platform/packages/apps/InCallUI into cm-11.0
Change-Id: I912d656d631ad86cc2ba741a48e0fd60b9b2e46d
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/call_button_fragment.xml16
1 files changed, 16 insertions, 0 deletions
diff --git a/res/layout/call_button_fragment.xml b/res/layout/call_button_fragment.xml
index 5fa170a9..c954a5be 100644
--- a/res/layout/call_button_fragment.xml
+++ b/res/layout/call_button_fragment.xml
@@ -166,6 +166,22 @@
android:contentDescription="@string/onscreenMergeCallsText"
android:visibility="gone"
/>
+ <!-- Separator between 5th (or 6th) button and right padding -->
+ <View style="@style/VerticalSeparator" />
+
+ <ImageButton
+ android:id="@+id/addParticipant"
+ style="@style/InCallButton"
+ android:background="@drawable/ic_add_group_holo_dark"
+ android:contentDescription="@string/onscreenAddParticipant" />
+
+ <View style="@style/VerticalSeparator" />
+
+ <Button android:id="@+id/modifyCallButton"
+ style="@style/InCallButton"
+ android:background="@drawable/btn_compound_vt"
+ android:contentDescription="@string/onscreenModifyCallText"
+ />
<!-- Separator between 3rd (or 4th) and 4th (or 6th) button -->
<View android:id="@+id/blacklistSpacer"