Merge "Move FAB back up 2dp" into lmp-preview-dev
diff --git a/res-common/drawable-hdpi/ic_arrow_back_24dp.png b/res-common/drawable-hdpi/ic_arrow_back_24dp.png
new file mode 100644
index 0000000..ddbb2c4
--- /dev/null
+++ b/res-common/drawable-hdpi/ic_arrow_back_24dp.png
Binary files differ
diff --git a/res-common/drawable-hdpi/ic_close_dk.png b/res-common/drawable-hdpi/ic_close_dk.png
new file mode 100644
index 0000000..9695529
--- /dev/null
+++ b/res-common/drawable-hdpi/ic_close_dk.png
Binary files differ
diff --git a/res-common/drawable-hdpi/ic_overflow_menu.png b/res-common/drawable-hdpi/ic_overflow_menu.png
index f21b181..262e9df 100644
--- a/res-common/drawable-hdpi/ic_overflow_menu.png
+++ b/res-common/drawable-hdpi/ic_overflow_menu.png
Binary files differ
diff --git a/res-common/drawable-mdpi/ic_arrow_back_24dp.png b/res-common/drawable-mdpi/ic_arrow_back_24dp.png
new file mode 100644
index 0000000..1a21fb4
--- /dev/null
+++ b/res-common/drawable-mdpi/ic_arrow_back_24dp.png
Binary files differ
diff --git a/res-common/drawable-mdpi/ic_close_dk.png b/res-common/drawable-mdpi/ic_close_dk.png
new file mode 100644
index 0000000..590a728
--- /dev/null
+++ b/res-common/drawable-mdpi/ic_close_dk.png
Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_arrow_back_24dp.png b/res-common/drawable-xhdpi/ic_arrow_back_24dp.png
new file mode 100644
index 0000000..bb73272
--- /dev/null
+++ b/res-common/drawable-xhdpi/ic_arrow_back_24dp.png
Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_close_dk.png b/res-common/drawable-xhdpi/ic_close_dk.png
new file mode 100644
index 0000000..5769f11
--- /dev/null
+++ b/res-common/drawable-xhdpi/ic_close_dk.png
Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_arrow_back_24dp.png b/res-common/drawable-xxhdpi/ic_arrow_back_24dp.png
new file mode 100644
index 0000000..72c51b0
--- /dev/null
+++ b/res-common/drawable-xxhdpi/ic_arrow_back_24dp.png
Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_close_dk.png b/res-common/drawable-xxhdpi/ic_close_dk.png
new file mode 100644
index 0000000..670bf79
--- /dev/null
+++ b/res-common/drawable-xxhdpi/ic_close_dk.png
Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_overflow_menu.png b/res-common/drawable-xxhdpi/ic_overflow_menu.png
index d0e961c..92526f5 100644
--- a/res-common/drawable-xxhdpi/ic_overflow_menu.png
+++ b/res-common/drawable-xxhdpi/ic_overflow_menu.png
Binary files differ
diff --git a/res-common/layout/dialpad.xml b/res-common/layout/dialpad.xml
index 1e7d1da..6c794a4 100644
--- a/res-common/layout/dialpad.xml
+++ b/res-common/layout/dialpad.xml
@@ -111,7 +111,7 @@
style="@style/DialpadKeyInternalLayoutStyle">
<com.android.contacts.common.dialpad.DialpadTextView
android:id="@id/dialpad_key_number"
- style="@style/DialpadKeyStarPoundStyle" />
+ style="@style/DialpadKeyStarStyle" />
</LinearLayout>
</com.android.contacts.common.dialpad.DialpadKeyButton>
<include layout="@layout/dialpad_key"
@@ -124,7 +124,7 @@
style="@style/DialpadKeyInternalLayoutStyle">
<com.android.contacts.common.dialpad.DialpadTextView
android:id="@id/dialpad_key_number"
- style="@style/DialpadKeyStarPoundStyle" />
+ style="@style/DialpadKeyPoundStyle" />
</LinearLayout>
</com.android.contacts.common.dialpad.DialpadKeyButton>
<Space style="@style/DialpadSpaceStyle" />
diff --git a/res-common/values/dimens.xml b/res-common/values/dimens.xml
index 854199e..96edaf5 100644
--- a/res-common/values/dimens.xml
+++ b/res-common/values/dimens.xml
@@ -112,7 +112,8 @@
<!-- Text dimensions for dialpad keys -->
<dimen name="dialpad_key_numbers_size">36sp</dimen>
<dimen name="dialpad_key_letters_size">8sp</dimen>
- <dimen name="dialpad_key_star_pound_size">23sp</dimen>
+ <dimen name="dialpad_key_pound_size">23sp</dimen>
+ <dimen name="dialpad_key_star_size">28sp</dimen>
<dimen name="dialpad_key_height">64dp</dimen>
<dimen name="dialpad_key_number_margin_bottom">2dp</dimen>
<dimen name="dialpad_symbol_margin_bottom">13dp</dimen>
diff --git a/res-common/values/styles.xml b/res-common/values/styles.xml
index 2606d5c..0f9fc90 100644
--- a/res-common/values/styles.xml
+++ b/res-common/values/styles.xml
@@ -105,9 +105,18 @@
<item name="android:gravity">center</item>
</style>
- <style name="DialpadKeyStarPoundStyle">
+ <style name="DialpadKeyStarStyle">
<item name="android:textColor">@color/dialpad_secondary_text_color</item>
- <item name="android:textSize">@dimen/dialpad_key_star_pound_size</item>
+ <item name="android:textSize">@dimen/dialpad_key_star_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_symbol_margin_bottom</item>
+ <item name="android:gravity">center</item>
+ </style>
+
+ <style name="DialpadKeyPoundStyle">
+ <item name="android:textColor">@color/dialpad_secondary_text_color</item>
+ <item name="android:textSize">@dimen/dialpad_key_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_symbol_margin_bottom</item>
