summaryrefslogtreecommitdiff
path: root/InCallUI/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'InCallUI/res/layout')
-rw-r--r--InCallUI/res/layout/call_button_fragment.xml12
-rw-r--r--InCallUI/res/layout/call_card_fragment.xml7
-rw-r--r--InCallUI/res/layout/secondary_call_info.xml7
3 files changed, 22 insertions, 4 deletions
diff --git a/InCallUI/res/layout/call_button_fragment.xml b/InCallUI/res/layout/call_button_fragment.xml
index 604d79e60..3629b8a3b 100644
--- a/InCallUI/res/layout/call_button_fragment.xml
+++ b/InCallUI/res/layout/call_button_fragment.xml
@@ -67,7 +67,8 @@
<ToggleButton android:id="@+id/audioButton"
style="@style/InCallCompoundButton"
android:background="@drawable/btn_compound_audio"
- android:contentDescription="@string/audio_mode_speaker" />
+ android:contentDescription="@string/audio_mode_speaker"
+ android:visibility="gone" />
<!-- "Change to audio call" for video calls. -->
<ImageButton android:id="@+id/changeToVoiceButton"
@@ -82,7 +83,8 @@
<ToggleButton android:id="@+id/muteButton"
style="@style/InCallCompoundButton"
android:background="@drawable/btn_compound_mute"
- android:contentDescription="@string/onscreenMuteText" />
+ android:contentDescription="@string/onscreenMuteText"
+ android:visibility="gone" />
<!-- CENTER SLOT ======================================================================= -->
@@ -90,7 +92,8 @@
<ToggleButton android:id="@+id/dialpadButton"
style="@style/InCallCompoundButton"
android:background="@drawable/btn_compound_dialpad"
- android:contentDescription="@string/onscreenShowDialpadText" />
+ android:contentDescription="@string/onscreenShowDialpadText"
+ android:visibility="gone" />
<!-- MIDDLE RIGHT SLOT ================================================================= -->
@@ -101,7 +104,8 @@
<ToggleButton android:id="@+id/holdButton"
style="@style/InCallCompoundButton"
android:background="@drawable/btn_compound_hold"
- android:contentDescription="@string/onscreenHoldText" />
+ android:contentDescription="@string/onscreenHoldText_unselected"
+ android:visibility="gone" />
<!-- "Swap" (or "Manage calls" in some CDMA states) -->
<ImageButton android:id="@+id/swapButton"
diff --git a/InCallUI/res/layout/call_card_fragment.xml b/InCallUI/res/layout/call_card_fragment.xml
index 615744c79..d28ffe018 100644
--- a/InCallUI/res/layout/call_card_fragment.xml
+++ b/InCallUI/res/layout/call_card_fragment.xml
@@ -93,6 +93,13 @@
</FrameLayout>
+ <fragment android:name="com.android.incallui.VideoCallFragment"
+ android:id="@+id/videoCallFragment"
+ android:layout_alignParentTop="true"
+ android:layout_gravity="top|center_horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
<!-- Secondary "Call info" block, for the background ("on hold") call. -->
<include layout="@layout/secondary_call_info" />
diff --git a/InCallUI/res/layout/secondary_call_info.xml b/InCallUI/res/layout/secondary_call_info.xml
index 85eef0ee1..e866795a6 100644
--- a/InCallUI/res/layout/secondary_call_info.xml
+++ b/InCallUI/res/layout/secondary_call_info.xml
@@ -40,6 +40,13 @@
android:paddingBottom="@dimen/secondary_call_info_vertical_padding"
android:background="?android:attr/selectableItemBackground">
+ <ImageView android:id="@+id/secondaryCallVideoCallIcon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/ic_toolbar_video"
+ android:tint="@color/incall_banner_secondary_text_color"
+ android:paddingEnd="16dp"/>
+
<ImageView android:id="@+id/secondaryCallConferenceCallIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"