merge in master-release history after reset to 85bf533e7e27e63c851d839f0ca6d9b57a4284b5
diff --git a/res-common/drawable/action_bar_tab.xml b/res-common/drawable/action_bar_tab.xml
index 8a3ea7a..b79ec5d 100644
--- a/res-common/drawable/action_bar_tab.xml
+++ b/res-common/drawable/action_bar_tab.xml
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android"
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:tint="@color/tab_pressed_color">
<item>
<selector>
@@ -35,4 +35,4 @@
<item android:drawable="@color/tab_default_color" />
</selector>
</item>
-</touch-feedback>
\ No newline at end of file
+</ripple>
\ No newline at end of file
diff --git a/res-common/drawable/btn_dialpad_key.xml b/res-common/drawable/btn_dialpad_key.xml
index ac08cf0..0a279f0 100644
--- a/res-common/drawable/btn_dialpad_key.xml
+++ b/res-common/drawable/btn_dialpad_key.xml
@@ -14,5 +14,5 @@
limitations under the License.
-->
-<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android"
+<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
diff --git a/res-common/layout/dialpad.xml b/res-common/layout/dialpad.xml
index 37b65b5..ecbcf07 100644
--- a/res-common/layout/dialpad.xml
+++ b/res-common/layout/dialpad.xml
@@ -33,12 +33,12 @@
style="@style/DialpadKeyButtonStyle">
<LinearLayout
style="@style/DialpadKeyInternalLayoutStyle">
- <TextView
+ <com.android.contacts.common.dialpad.DialpadTextView
android:id="@+id/dialpad_key_number"
style="@style/DialpadKeyNumberStyle" />
<RelativeLayout
android:layout_width="wrap_content"
- android:layout_height="@dimen/dialpad_subtext_height" >
+ android:layout_height="wrap_content" >
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -46,6 +46,8 @@
android:src="@drawable/ic_dial_action_vm"
android:scaleType="fitCenter"
android:layout_centerInParent="true" />
+ <!-- Place empty text view so vertical height is same as other dialpad keys. -->
+ <TextView style="@style/DialpadKeyLettersStyle" />
</RelativeLayout>
</LinearLayout>
</com.android.contacts.common.dialpad.DialpadKeyButton>
@@ -105,7 +107,7 @@
style="@style/DialpadKeyButtonStyle">
<LinearLayout
style="@style/DialpadKeyInternalLayoutStyle">
- <TextView
+ <com.android.contacts.common.dialpad.DialpadTextView
android:id="@id/dialpad_key_number"
style="@style/DialpadKeyStarPoundStyle" />
</LinearLayout>
@@ -118,7 +120,7 @@
style="@style/DialpadKeyButtonStyle">
<LinearLayout
style="@style/DialpadKeyInternalLayoutStyle">
- <TextView
+ <com.android.contacts.common.dialpad.DialpadTextView
android:id="@id/dialpad_key_number"
style="@style/DialpadKeyStarPoundStyle" />
</LinearLayout>
diff --git a/res-common/layout/dialpad_key.xml b/res-common/layout/dialpad_key.xml
index b7c373a..1d2d55a 100644
--- a/res-common/layout/dialpad_key.xml
+++ b/res-common/layout/dialpad_key.xml
@@ -24,7 +24,7 @@
<!-- Note in the referenced styles that we assign hard widths to these components
because we want them to line up vertically when we arrange them in an MxN grid -->
- <TextView
+ <com.android.contacts.common.dialpad.DialpadTextView
android:id="@+id/dialpad_key_number"
style="@style/DialpadKeyNumberStyle" />
diff --git a/res-common/layout/dialpad_view.xml b/res-common/layout/dialpad_view.xml
index 3644bd9..0c96997 100644
--- a/res-common/layout/dialpad_view.xml
+++ b/res-common/layout/dialpad_view.xml
@@ -41,7 +41,8 @@
android:paddingLeft="@dimen/dialpad_digits_padding"
android:paddingRight="@dimen/dialpad_digits_menu_right_padding"
android:contentDescription="@string/description_dialpad_overflow"
- android:gravity="center" />
+ android:gravity="center"
+ android:visibility="gone" />
<view class="com.android.contacts.common.dialpad.DigitsEditText"
android:id="@+id/digits"
diff --git a/res-common/values/attrs.xml b/res-common/values/attrs.xml
index 0509da6..f31ff02 100644
--- a/res-common/values/attrs.xml
+++ b/res-common/values/attrs.xml
@@ -75,4 +75,5 @@
<declare-styleable name="Favorites">
<attr name="favorites_padding_bottom" format="dimension"/>
</declare-styleable>
+
</resources>
diff --git a/res-common/values/dimens.xml b/res-common/values/dimens.xml
index 8554228..29dc4d4 100644
--- a/res-common/values/dimens.xml
+++ b/res-common/values/dimens.xml
@@ -105,10 +105,11 @@
<dimen name="tab_text_size">14sp</dimen>
<!-- Text dimensions for dialpad keys -->
- <dimen name="dialpad_key_numbers_size">34dp</dimen>
- <dimen name="dialpad_key_letters_size">8dp</dimen>
- <dimen name="dialpad_key_star_pound_size">23dp</dimen>
+ <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_height">64dp</dimen>
+ <dimen name="dialpad_key_number_margin_bottom">2dp</dimen>
<dimen name="dialpad_subtext_height">10dp</dimen>
<!-- The bottom row of the dialpad is slightly taller to account for the dial button -->
<dimen name="dialpad_bottom_key_height">72dp</dimen>
diff --git a/res-common/values/styles.xml b/res-common/values/styles.xml
index 80431f9..9d7c8a3 100644
--- a/res-common/values/styles.xml
+++ b/res-common/values/styles.xml
@@ -99,8 +99,9 @@
<item name="android:textColor">@color/dialpad_primary_text_color</item>
<item name="android:textSize">@dimen/dialpad_key_numbers_size</item>
<item name="android:fontFamily">sans-serif-light</item>
- <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_marginBottom">@dimen/dialpad_key_number_margin_bottom</item>
<item name="android:gravity">center</item>
</style>
@@ -117,9 +118,9 @@
<item name="android:textColor">@color/dialpad_secondary_text_color</item>
<item name="android:textSize">@dimen/dialpad_key_letters_size</item>
<item name="android:fontFamily">sans-serif-medium</item>
- <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
- <item name="android:gravity">center</item>
+ <item name="android:gravity">center_horizontal</item>
</style>
<style name="DialpadKeyButtonStyle">
@@ -128,6 +129,7 @@
<item name="android:layout_width">0dp</item>
<item name="android:layout_height">match_parent</item>
<item name="android:layout_weight">13</item>
+ <item name="android:minHeight">@dimen/dialpad_key_height</item>
<item name="android:background">@drawable/btn_dialpad_key</item>
<item name="android:focusable">true</item>
</style>
@@ -140,6 +142,7 @@
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_gravity">center</item>
+ <item name="android:gravity">center</item>
<item name="android:orientation">vertical</item>
</style>
</resources>