Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
diff --git a/res/layout/emergency_dialer.xml b/res/layout/emergency_dialer.xml
index 9bb5570..2a45433 100644
--- a/res/layout/emergency_dialer.xml
+++ b/res/layout/emergency_dialer.xml
@@ -21,7 +21,7 @@
android:layout_height="match_parent"
android:paddingLeft="36dp"
android:paddingRight="36dp"
- android:paddingBottom="36dp">
+ android:paddingBottom="@dimen/dialpad_bottom_padding">
<LinearLayout
android:layout_width="match_parent"
diff --git a/res/values-h500dp/dimens.xml b/res/values-h500dp/dimens.xml
new file mode 100644
index 0000000..2c7c797
--- /dev/null
+++ b/res/values-h500dp/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2017 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+
+<resources>
+ <dimen name="dialpad_bottom_padding">36dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 0a21d27..5dc7279 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -71,6 +71,7 @@
<dimen name="dialpad_digits_text_size">40sp</dimen>
<dimen name="dialpad_space_above_keys">29dp</dimen>
<dimen name="dialpad_bottom_key_height">113dp</dimen>
+ <dimen name="dialpad_bottom_padding">0dp</dimen>
<!-- Just used in landscape mode -->
<dimen name="emergency_dialer_digits_height">0px</dimen>