From 71950e6323746c04a10e79b5c60d3e144d9c3571 Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Mon, 8 Sep 2014 11:20:08 -0700
Subject: Import translations. DO NOT MERGE

Change-Id: Ib712cc16bc723252df6d21314e207e8cefd3fbe5
Auto-generated-cl: translation import
---
 res/values-cs/strings.xml | 6 +++---
 res/values-hr/strings.xml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9fb79eb..1dd1c21 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -18,9 +18,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="dialpad_0_number" msgid="9125850639884993690">"0"</string>
-    <string name="dialpad_1_number" msgid="761747742902363751">"1."</string>
-    <string name="dialpad_2_number" msgid="4473872718353086388">"2."</string>
-    <string name="dialpad_3_number" msgid="2631223250001985194">"3."</string>
+    <string name="dialpad_1_number" msgid="761747742902363751">"1"</string>
+    <string name="dialpad_2_number" msgid="4473872718353086388">"2"</string>
+    <string name="dialpad_3_number" msgid="2631223250001985194">"3"</string>
     <string name="dialpad_4_number" msgid="5209564123577292452">"4"</string>
     <string name="dialpad_5_number" msgid="5634625806116989866">"5"</string>
     <string name="dialpad_6_number" msgid="799658410454143963">"6"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index de505c1..1fb2714 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -18,9 +18,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="dialpad_0_number" msgid="9125850639884993690">"0"</string>
-    <string name="dialpad_1_number" msgid="761747742902363751">"1."</string>
-    <string name="dialpad_2_number" msgid="4473872718353086388">"2."</string>
-    <string name="dialpad_3_number" msgid="2631223250001985194">"3."</string>
+    <string name="dialpad_1_number" msgid="761747742902363751">"1"</string>
+    <string name="dialpad_2_number" msgid="4473872718353086388">"2"</string>
+    <string name="dialpad_3_number" msgid="2631223250001985194">"3"</string>
     <string name="dialpad_4_number" msgid="5209564123577292452">"4"</string>
     <string name="dialpad_5_number" msgid="5634625806116989866">"5"</string>
     <string name="dialpad_6_number" msgid="799658410454143963">"6"</string>
-- 
cgit v1.2.3


From e48245818e2bfb4e78d4a5a4bd462b12c797ffd0 Mon Sep 17 00:00:00 2001
From: Brian Attwell <brianattwell@google.com>
Date: Thu, 11 Sep 2014 14:23:09 -0700
Subject: Move green fab drawables into phone common

Bug: 17380050
Change-Id: I01775822d6e5eb14648162721348e4e5bb7b2f53
---
 res/drawable-hdpi/fab_green.png    | Bin 0 -> 2798 bytes
 res/drawable-mdpi/fab_green.png    | Bin 0 -> 1845 bytes
 res/drawable-xhdpi/fab_green.png   | Bin 0 -> 4092 bytes
 res/drawable-xxhdpi/fab_green.png  | Bin 0 -> 7004 bytes
 res/drawable-xxxhdpi/fab_green.png | Bin 0 -> 9900 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 res/drawable-hdpi/fab_green.png
 create mode 100644 res/drawable-mdpi/fab_green.png
 create mode 100644 res/drawable-xhdpi/fab_green.png
 create mode 100644 res/drawable-xxhdpi/fab_green.png
 create mode 100644 res/drawable-xxxhdpi/fab_green.png

diff --git a/res/drawable-hdpi/fab_green.png b/res/drawable-hdpi/fab_green.png
new file mode 100644
index 0000000..ff9753c
Binary files /dev/null and b/res/drawable-hdpi/fab_green.png differ
diff --git a/res/drawable-mdpi/fab_green.png b/res/drawable-mdpi/fab_green.png
new file mode 100644
index 0000000..947aac1
Binary files /dev/null and b/res/drawable-mdpi/fab_green.png differ
diff --git a/res/drawable-xhdpi/fab_green.png b/res/drawable-xhdpi/fab_green.png
new file mode 100644
index 0000000..e8bab3f
Binary files /dev/null and b/res/drawable-xhdpi/fab_green.png differ
diff --git a/res/drawable-xxhdpi/fab_green.png b/res/drawable-xxhdpi/fab_green.png
new file mode 100644
index 0000000..7e4fd3e
Binary files /dev/null and b/res/drawable-xxhdpi/fab_green.png differ
diff --git a/res/drawable-xxxhdpi/fab_green.png b/res/drawable-xxxhdpi/fab_green.png
new file mode 100644
index 0000000..aa8849e
Binary files /dev/null and b/res/drawable-xxxhdpi/fab_green.png differ
-- 
cgit v1.2.3


From 1b8e8d7c021ad71c27465ea14f354cb09cbfe65e Mon Sep 17 00:00:00 2001
From: Brian Attwell <brianattwell@google.com>
Date: Thu, 11 Sep 2014 16:34:47 -0700
Subject: Parameterize a spacing dimen in dialpad

I intend to override these values inside Telephony.

Bug: 17380050
Change-Id: I27485585c5fda2edbf0b1444b85aba0379c9cd28
---
 res/layout/dialpad_view.xml | 2 +-
 res/values/dimens.xml       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/res/layout/dialpad_view.xml b/res/layout/dialpad_view.xml
index 9340667..a6ff7aa 100644
--- a/res/layout/dialpad_view.xml
+++ b/res/layout/dialpad_view.xml
@@ -86,7 +86,7 @@
 
     <Space
         android:layout_width="match_parent"
-        android:layout_height="14dp" />
+        android:layout_height="@dimen/dialpad_space_above_keys" />
 
     <include layout="@layout/dialpad" />
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 41c6426..0dc916e 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -40,6 +40,8 @@
     <dimen name="dialpad_voicemail_icon_padding_top">2dp</dimen>
     <dimen name="dialpad_key_button_translate_y">100dp</dimen>
     <dimen name="dialpad_overflow_margin">8dp</dimen>
+    <dimen name="dialpad_space_above_keys">14dp</dimen>
+
     <!-- Height of the floating action button -->
     <dimen name="floating_action_button_height">56dp</dimen>
     <!-- Width of the floating action button -->
-- 
cgit v1.2.3