Merge "settings.gradle for Dialer" into nyc-dev
diff --git a/InCallUI/res/values/array.xml b/InCallUI/res/values/array.xml
index 8744d3e..7877ec8 100644
--- a/InCallUI/res/values/array.xml
+++ b/InCallUI/res/values/array.xml
@@ -76,10 +76,10 @@
<item>@drawable/ic_lockscreen_answer_video</item>
</array>
<array name="incoming_call_widget_video_without_sms_target_descriptions">
- <item>@string/description_target_answer_audio_call</item>
+ <item>@string/description_target_answer_video_call</item>
<item>@null</item>
<item>@string/description_target_decline</item>
- <item>@string/description_target_answer_video_call</item>
+ <item>@string/description_target_answer_audio_call</item>
</array>
<array name="incoming_call_widget_video_without_sms_direction_descriptions">
<item>@string/description_direction_right</item>
@@ -89,21 +89,21 @@
</array>
<!-- For video calls, if respond via SMS is enabled:
- - Answer as audio call (drag right)
+ - Answer as video call (drag right)
- Respond via SMS (drag up)
- Decline (drag left)
- - Answer as video call (drag down) -->
+ - Answer as audio call (drag down) -->
<array name="incoming_call_widget_video_with_sms_targets">
- <item>@drawable/ic_lockscreen_answer</item>
+ <item>@drawable/ic_lockscreen_answer_video</item>
<item>@drawable/ic_lockscreen_text</item>
<item>@drawable/ic_lockscreen_decline</item>
- <item>@drawable/ic_lockscreen_answer_video</item>
+ <item>@drawable/ic_lockscreen_answer</item>
</array>
<array name="incoming_call_widget_video_with_sms_target_descriptions">
- <item>@string/description_target_answer_audio_call</item>
+ <item>@string/description_target_answer_video_call</item>
<item>@string/description_target_send_sms</item>
<item>@string/description_target_decline</item>
- <item>@string/description_target_answer_video_call</item>
+ <item>@string/description_target_answer_audio_call</item>
</array>
<array name="incoming_call_widget_video_with_sms_direction_descriptions">
<item>@string/description_direction_right</item>
diff --git a/res/layout-land/dialpad_fragment.xml b/res/layout-land/dialpad_fragment.xml
index 680c2d7..70a38ae 100644
--- a/res/layout-land/dialpad_fragment.xml
+++ b/res/layout-land/dialpad_fragment.xml
@@ -28,7 +28,7 @@
android:id="@+id/spacer"
android:layout_width="0dp"
android:layout_height="match_parent"
- android:layout_weight="1"
+ android:layout_weight="4"
android:background="#00000000" />
<!-- Dialpad shadow -->
@@ -40,7 +40,7 @@
<RelativeLayout
android:layout_height="match_parent"
android:layout_width="0dp"
- android:layout_weight="1">
+ android:layout_weight="6">
<include layout="@layout/dialpad_view"
android:layout_height="match_parent"
@@ -60,7 +60,7 @@
<!-- Margin bottom and alignParentBottom don't work well together, so use a Space instead. -->
<Space android:id="@+id/dialpad_floating_action_button_margin_bottom"
android:layout_width="match_parent"
- android:layout_height="8dp"
+ android:layout_height="@dimen/floating_action_button_margin_bottom"
android:layout_alignParentBottom="true" />
<FrameLayout