Merge "Add content description to plus string"
diff --git a/res-common/drawable/btn_dialpad_key.xml b/res-common/drawable/btn_dialpad_key.xml
index 0a279f0..a04d35a 100644
--- a/res-common/drawable/btn_dialpad_key.xml
+++ b/res-common/drawable/btn_dialpad_key.xml
@@ -15,4 +15,5 @@
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:tint="@color/dialpad_touch_tint" android:pinned="true"/>
\ No newline at end of file
+ android:tint="?android:attr/colorControlHighlight"
+ android:pinned="true"/>
\ No newline at end of file
diff --git a/res-common/layout/dialpad_view.xml b/res-common/layout/dialpad_view.xml
index 0c96997..bc02bec 100644
--- a/res-common/layout/dialpad_view.xml
+++ b/res-common/layout/dialpad_view.xml
@@ -30,6 +30,7 @@
android:id="@+id/digits_container"
android:layout_width="match_parent"
android:layout_height="@dimen/dialpad_digits_height"
+ android:layout_marginBottom="@dimen/dialpad_digits_margin_bottom"
android:orientation="horizontal">
<ImageButton android:id="@+id/dialpad_overflow"
@@ -76,6 +77,20 @@
android:src="@drawable/ic_dialpad_delete" />
</LinearLayout>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#d6d6d6" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#ffffff" />
+
+ <Space
+ android:layout_width="match_parent"
+ android:layout_height="8dp" />
+
<include layout="@layout/dialpad" />
<Space
diff --git a/res-common/values/attrs.xml b/res-common/values/attrs.xml
index dfba0d8..524df94 100644
--- a/res-common/values/attrs.xml
+++ b/res-common/values/attrs.xml
@@ -59,6 +59,7 @@
<attr name="list_item_name_text_color" format="color"/>
<attr name="list_item_name_text_size" format="dimension"/>
<attr name="list_item_text_indent" format="dimension"/>
+ <attr name="list_item_text_offset_top" format="dimension"/>
<attr name="list_item_data_width_weight" format="integer"/>
<attr name="list_item_label_width_weight" format="integer"/>
</declare-styleable>
@@ -78,4 +79,7 @@
<attr name="favorites_padding_bottom" format="dimension"/>
</declare-styleable>
+ <declare-styleable name="Dialpad">
+ <attr name="dialpad_key_button_touch_tint" format="color"/>
+ </declare-styleable>
</resources>
diff --git a/res-common/values/colors.xml b/res-common/values/colors.xml
index fd0466d..1d727d5 100644
--- a/res-common/values/colors.xml
+++ b/res-common/values/colors.xml
@@ -85,15 +85,11 @@
<color name="actionbar_unselected_text_color">#a6ffffff</color>
<!-- Colors for the dialpad -->
- <color name="background_dialpad">#ffffff</color>
+ <color name="background_dialpad">#fcfcfc</color>
<color name="background_dialpad_pressed">#ececec</color>
<color name="dialpad_primary_text_color">#26c6da</color>
<color name="dialpad_secondary_text_color">#999999</color>
- <!-- 75% opacity, black. -->
- <color name="dialpad_digits_text_color">#bf000000</color>
+ <color name="dialpad_digits_text_color">#666666</color>
<color name="dialpad_separator_line_color">#dadada</color>
<color name="dialpad_icon_tint">#b3b3b3</color>
-
- <!-- 35% opacity, black. -->
- <color name="dialpad_touch_tint">#59000000</color>
</resources>
diff --git a/res-common/values/dimens.xml b/res-common/values/dimens.xml
index 4904400..92a98bf 100644
--- a/res-common/values/dimens.xml
+++ b/res-common/values/dimens.xml
@@ -102,6 +102,10 @@
<!-- Padding to be applied to the bottom of lists to make space for the floating action
button -->
<dimen name="floating_action_button_list_bottom_padding">88dp</dimen>
+ <!-- Right margin of the floating action button -->
+ <dimen name="floating_action_button_margin_right">16dp</dimen>
+ <!-- Bottom margin of the floating action button -->
+ <dimen name="floating_action_button_margin_bottom">16dp</dimen>
<!-- Height of the selection indicator of a tab. -->
<dimen name="tab_selected_underline_height">3dp</dimen>
@@ -115,16 +119,16 @@
<dimen name="dialpad_key_star_pound_size">23sp</dimen>
<dimen name="dialpad_key_height">64dp</dimen>
<dimen name="dialpad_key_number_margin_bottom">2dp</dimen>
- <dimen name="dialpad_subtext_height">10dp</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">72dp</dimen>
+ <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">36dp</dimen>
<dimen name="dialpad_digits_height">64dp</dimen>
+ <dimen name="dialpad_digits_margin_bottom">22dp</dimen>
<dimen name="dialpad_digits_padding">16dp</dimen>
<dimen name="dialpad_digits_menu_right_padding">10dp</dimen>
- <dimen name="dialpad_digits_margin_bottom">0px</dimen>
<dimen name="dialpad_center_margin">3dp</dimen>
<dimen name="dialpad_button_margin">2dp</dimen>
<dimen name="dialpad_voicemail_icon_padding_top">2dp</dimen>
diff --git a/res-common/values/styles.xml b/res-common/values/styles.xml
index 9d7c8a3..488deda 100644
--- a/res-common/values/styles.xml
+++ b/res-common/values/styles.xml
@@ -63,7 +63,7 @@
</style>
<style name="TextAppearanceSmall" parent="@android:style/TextAppearance.Small">
- <item name="android:textSize">12sp</item>
+ <item name="android:textSize">14sp</item>
<item name="android:textColor">#888888</item>
</style>
@@ -110,7 +110,7 @@
<item name="android:textSize">@dimen/dialpad_key_star_pound_size</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
- <item name="android:layout_marginBottom">@dimen/dialpad_subtext_height</item>
+ <item name="android:layout_marginBottom">@dimen/dialpad_symbol_margin_bottom</item>
<item name="android:gravity">center</item>
</style>