summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
Diffstat (limited to 'InCallUI')
-rw-r--r--InCallUI/res/layout/call_card_fragment.xml54
-rw-r--r--InCallUI/res/layout/video_call_views.xml2
-rw-r--r--InCallUI/res/values-h600dp/dimens.xml2
-rw-r--r--InCallUI/res/values-w600dp-land/dimens.xml4
-rw-r--r--InCallUI/res/values/dimens.xml4
5 files changed, 36 insertions, 30 deletions
diff --git a/InCallUI/res/layout/call_card_fragment.xml b/InCallUI/res/layout/call_card_fragment.xml
index 4c600bd05..03bbe87b8 100644
--- a/InCallUI/res/layout/call_card_fragment.xml
+++ b/InCallUI/res/layout/call_card_fragment.xml
@@ -78,6 +78,33 @@
</FrameLayout>
+ <!-- Progress spinner, useful for indicating pending operations such as upgrade to video. -->
+ <FrameLayout
+ android:id="@+id/progressSpinner"
+ android:background="#63000000"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_centerHorizontal="true"
+ android:layout_centerVertical="true"
+ android:visibility="gone" >
+
+ <ProgressBar
+ android:id="@+id/progress_bar"
+ style="@android:style/Widget.Material.ProgressBar"
+ android:layout_gravity="center"
+ android:layout_width="48dp"
+ android:layout_height="48dp"
+ android:indeterminate="true" />
+
+ </FrameLayout>
+
+ <fragment android:name="com.android.incallui.VideoCallFragment"
+ android:layout_alignParentStart="true"
+ android:layout_gravity="start|center_vertical"
+ android:id="@+id/videoCallFragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
<FrameLayout
android:layout_height="match_parent"
android:layout_width="0dp"
@@ -126,33 +153,6 @@
android:layout_height="wrap_content"
android:layout_alignTop="@id/photoLarge" />
- <!-- Progress spinner, useful for indicating pending operations such as upgrade to video. -->
- <FrameLayout
- android:id="@+id/progressSpinner"
- android:background="#63000000"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_centerHorizontal="true"
- android:layout_centerVertical="true"
- android:visibility="gone" >
-
- <ProgressBar
- android:id="@+id/progress_bar"
- style="@android:style/Widget.Material.ProgressBar"
- android:layout_gravity="center"
- android:layout_width="48dp"
- android:layout_height="48dp"
- android:indeterminate="true" />
-
- </FrameLayout>
-
- <fragment android:name="com.android.incallui.VideoCallFragment"
- android:layout_alignParentStart="true"
- android:layout_gravity="start|center_vertical"
- android:id="@+id/videoCallFragment"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
-
</FrameLayout>
</RelativeLayout>
diff --git a/InCallUI/res/layout/video_call_views.xml b/InCallUI/res/layout/video_call_views.xml
index b0c6ce2ad..d514f6df1 100644
--- a/InCallUI/res/layout/video_call_views.xml
+++ b/InCallUI/res/layout/video_call_views.xml
@@ -29,7 +29,7 @@
<FrameLayout
android:id="@+id/previewVideoContainer"
android:layout_width="70dp"
- android:layout_height="120dp"
+ android:layout_height="0dp"
android:layout_gravity="bottom|right"
android:layout_margin="@dimen/video_preview_margin" >
diff --git a/InCallUI/res/values-h600dp/dimens.xml b/InCallUI/res/values-h600dp/dimens.xml
index 978efde40..dda755a3e 100644
--- a/InCallUI/res/values-h600dp/dimens.xml
+++ b/InCallUI/res/values-h600dp/dimens.xml
@@ -26,4 +26,6 @@
<dimen name="floating_action_button_vertical_offset">-24dp</dimen>
<dimen name="dialpad_elevation">2dp</dimen>
+
+ <dimen name="video_preview_margin">20dp</dimen>
</resources>
diff --git a/InCallUI/res/values-w600dp-land/dimens.xml b/InCallUI/res/values-w600dp-land/dimens.xml
index d91318f5e..112ec5f09 100644
--- a/InCallUI/res/values-w600dp-land/dimens.xml
+++ b/InCallUI/res/values-w600dp-land/dimens.xml
@@ -21,11 +21,15 @@
<!-- Whether or not the landscape mode layout is currently being used -->
<bool name="is_layout_landscape">true</bool>
+
<!-- Height and width of the in-call buttons. -->
<dimen name="in_call_button_dimension">40dp</dimen>
+
<!-- Margin underneath the call buttons. This is used only in landscape mode and is sized
so that the call buttons are center aligned with the end call button. -->
<dimen name="call_buttons_bottom_margin">30dp</dimen>
<dimen name="dialpad_elevation">2dp</dimen>
+
+ <dimen name="video_preview_margin">20dp</dimen>
</resources>
diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml
index b3c569e7d..59da7860a 100644
--- a/InCallUI/res/values/dimens.xml
+++ b/InCallUI/res/values/dimens.xml
@@ -61,7 +61,7 @@
<dimen name="in_call_button_dimension">48dp</dimen>
<dimen name="primary_call_elevation">0dp</dimen>
- <dimen name="dialpad_elevation">5dp</dimen>
+ <dimen name="dialpad_elevation">2dp</dimen>
<!-- The InCallUI dialpad will sometimes want digits sizes that are different from dialer.
Note: These are the default sizes for small (<600dp height) devices: larger screen sizes
@@ -117,7 +117,7 @@
width of the preview. When in landscape, this is the height. -->
<dimen name="video_preview_small_dimension">90dp</dimen>
- <dimen name="video_preview_margin">20dp</dimen>
+ <dimen name="video_preview_margin">0dp</dimen>
<dimen name="end_call_floating_action_button_diameter">72dp</dimen>
<dimen name="end_call_floating_action_button_small_diameter">56dp</dimen>