Merge "More tweaks to landscape dialpad" into lmp-dev
diff --git a/res/layout-land/dialpad_key_one.xml b/res/layout-land/dialpad_key_one.xml
index c7c3117..bfbbdf9 100644
--- a/res/layout-land/dialpad_key_one.xml
+++ b/res/layout-land/dialpad_key_one.xml
@@ -27,11 +27,11 @@
style="@style/DialpadKeyNumberStyle"
android:layout_gravity="right"
android:layout_marginBottom="0dp"
- android:layout_marginRight="@dimen/dialpad_key_margin_right" />
- <RelativeLayout
+ android:layout_marginRight="@dimen/dialpad_key_one_margin_right" />
+ <FrameLayout
android:layout_width="@dimen/dialpad_key_text_width"
android:layout_height="wrap_content"
- android:layout_gravity="right|bottom" >
+ android:layout_gravity="left|bottom" >
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -39,10 +39,7 @@
android:id="@+id/dialpad_key_voicemail"
android:src="@drawable/ic_dialpad_voicemail"
android:scaleType="fitCenter"
- android:layout_centerInParent="true"
- android:tint="@color/dialpad_secondary_text_color" />
- <!-- Place empty text view so vertical height is same as other dialpad keys. -->
- <TextView style="@style/DialpadKeyLettersStyle" />
- </RelativeLayout>
+ android:tint="@color/dialpad_voicemail_tint" />
+ </FrameLayout>
</LinearLayout>
</com.android.phone.common.dialpad.DialpadKeyButton>
diff --git a/res/layout/dialpad_key_one.xml b/res/layout/dialpad_key_one.xml
index a7f5aaa..5a9d13f 100644
--- a/res/layout/dialpad_key_one.xml
+++ b/res/layout/dialpad_key_one.xml
@@ -33,7 +33,7 @@
android:src="@drawable/ic_dialpad_voicemail"
android:scaleType="fitCenter"
android:layout_centerInParent="true"
- android:tint="@color/dialpad_secondary_text_color" />
+ android:tint="@color/dialpad_voicemail_tint" />
<!-- Place empty text view so vertical height is same as other dialpad keys. -->
<TextView style="@style/DialpadKeyLettersStyle" />
</RelativeLayout>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 72e6b3d..e82d1fa 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -16,6 +16,8 @@
-->
<resources>
<dimen name="dialpad_key_margin_right">5dp</dimen>
+ <!-- Right margins for specific keys to align them correctly -->
+ <dimen name="dialpad_key_one_margin_right">3dp</dimen>
<dimen name="dialpad_key_text_width">35dp</dimen>
<dimen name="dialpad_key_number_width">20sp</dimen>
<dimen name="dialpad_symbol_margin_bottom">0dp</dimen>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 2c24b05..27226b7 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -25,4 +25,5 @@
<color name="dialpad_digits_text_color">#333</color>
<color name="dialpad_separator_line_color">#dadada</color>
<color name="dialpad_icon_tint">#b3b3b3</color>
+ <color name="dialpad_voicemail_tint">#919191</color>
</resources>