From f52c84e139839fdabe836f2bce690d0803ad340d Mon Sep 17 00:00:00 2001
From: Qi Wang <wangqi@google.com>
Date: Thu, 18 Feb 2016 13:58:58 -0800
Subject: Fix overlapping of + and dial button in landscape multi-window mode.

This change also clean up a little around dial pad view.

Bug: 26861613
Change-Id: I54dfc5df75038ffce296fc1751acce61434356bf
---
 res/layout/dialpad.xml               | 2 +-
 res/layout/dialpad_view_unthemed.xml | 2 +-
 res/values-land/dimens.xml           | 3 +++
 res/values/dimens.xml                | 5 +++--
 res/values/styles.xml                | 4 ----
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'res')

diff --git a/res/layout/dialpad.xml b/res/layout/dialpad.xml
index 4cca336..ebfb22d 100644
--- a/res/layout/dialpad.xml
+++ b/res/layout/dialpad.xml
@@ -87,5 +87,5 @@
     </LinearLayout>
     <Space
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dialpad_bottom_key_height" />
+        android:layout_height="@dimen/dialpad_bottom_space_height" />
 </LinearLayout>
diff --git a/res/layout/dialpad_view_unthemed.xml b/res/layout/dialpad_view_unthemed.xml
index 74e785a..fe26457 100644
--- a/res/layout/dialpad_view_unthemed.xml
+++ b/res/layout/dialpad_view_unthemed.xml
@@ -128,6 +128,6 @@
 
     <Space
         android:layout_width="match_parent"
-        android:layout_height="8dp" />
+        android:layout_height="@dimen/dialpad_space_below_keys" />
 
 </view>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index e82d1fa..42d22f6 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -21,4 +21,7 @@
     <dimen name="dialpad_key_text_width">35dp</dimen>
     <dimen name="dialpad_key_number_width">20sp</dimen>
     <dimen name="dialpad_symbol_margin_bottom">0dp</dimen>
+
+    <!-- The bottom space of the dialpad to account for the dial button -->
+    <dimen name="dialpad_bottom_space_height">65dp</dimen>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 0c342ba..adaef0a 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -28,8 +28,6 @@
     <dimen name="dialpad_zero_key_number_margin_bottom">@dimen/dialpad_zero_key_number_default_margin_bottom</dimen>
     <dimen name="dialpad_zero_key_number_default_margin_bottom">1dp</dimen>
     <dimen name="dialpad_symbol_margin_bottom">13dp</dimen>
-    <!-- The bottom row of the dialpad is slightly taller to account for the dial button -->
-    <dimen name="dialpad_bottom_key_height">65dp</dimen>
     <dimen name="dialpad_key_plus_size">18sp</dimen>
     <dimen name="dialpad_horizontal_padding">5dp</dimen>
     <dimen name="dialpad_digits_text_size">34sp</dimen>
@@ -47,6 +45,9 @@
     <dimen name="dialpad_key_button_translate_y">100dp</dimen>
     <dimen name="dialpad_overflow_margin">8dp</dimen>
     <dimen name="dialpad_space_above_keys">14dp</dimen>
+    <dimen name="dialpad_space_below_keys">8dp</dimen>
+    <!-- The bottom space of the dialpad to account for the dial button -->
+    <dimen name="dialpad_bottom_space_height">80dp</dimen>
 
     <!-- Height of the floating action button -->
     <dimen name="floating_action_button_height">56dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index b563705..8eee67d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -77,10 +77,6 @@
         <item name="android:focusable">true</item>
     </style>
 
-    <style name="DialpadBottomKeyButtonStyle" parent="DialpadKeyButtonStyle">
-        <item name="android:layout_height">@dimen/dialpad_bottom_key_height</item>
-    </style>
-
     <style name="DialpadKeyInternalLayoutStyle">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-- 
cgit v1.2.3