Merge changes I6dd82ca9,I310bcbf0 into atel.lnx.2.0-dev
* changes:
Dialer: Add call/data usage Timer in Dialer setting
InCallUI: customize video call UI
diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml
index 1b6e01c..a9ef075 100644
--- a/InCallUI/res/layout/primary_call_info.xml
+++ b/InCallUI/res/layout/primary_call_info.xml
@@ -137,7 +137,7 @@
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="@dimen/in_call_layout_height"
android:orientation="horizontal"
android:clipChildren="false"
android:clipToPadding="false">
@@ -145,7 +145,7 @@
<ImageView android:id="@+id/hdAudioIcon"
android:src="@drawable/ic_hd_24dp"
android:layout_width="24dp"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:tint="@color/incall_call_banner_subtext_color"
android:scaleType="fitCenter"
diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml
index 59da786..15520e5 100644
--- a/InCallUI/res/values/dimens.xml
+++ b/InCallUI/res/values/dimens.xml
@@ -63,6 +63,9 @@
<dimen name="primary_call_elevation">0dp</dimen>
<dimen name="dialpad_elevation">2dp</dimen>
+ <!-- layout height -->
+ <dimen name="in_call_layout_height">40dp</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
apply the values in values-h600dp/dimens.xml. -->