Merge "Tweak Dialpad redlines" into klp-dev
diff --git a/res/drawable-hdpi/ic_dial_action_vm.png b/res/drawable-hdpi/ic_dial_action_vm.png
index 68ee3d6..f424304 100644
--- a/res/drawable-hdpi/ic_dial_action_vm.png
+++ b/res/drawable-hdpi/ic_dial_action_vm.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_dial_action_vm.png b/res/drawable-mdpi/ic_dial_action_vm.png
index 5b91b42..fbcf378 100644
--- a/res/drawable-mdpi/ic_dial_action_vm.png
+++ b/res/drawable-mdpi/ic_dial_action_vm.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_dial_action_vm.png b/res/drawable-xhdpi/ic_dial_action_vm.png
index 269fd1a..2919bbd 100644
--- a/res/drawable-xhdpi/ic_dial_action_vm.png
+++ b/res/drawable-xhdpi/ic_dial_action_vm.png
Binary files differ
diff --git a/res/layout/dialpad.xml b/res/layout/dialpad.xml
index 60240bc..ec850c9 100644
--- a/res/layout/dialpad.xml
+++ b/res/layout/dialpad.xml
@@ -37,23 +37,26 @@
android:id="@+id/one"
style="@style/DialtactsDialpadButtonStyle"
android:clickable="true" >
- <TextView
- android:id="@+id/dialpad_key_number"
+ <LinearLayout
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="@color/dialpad_primary_text_color"
- android:textSize="@dimen/dialpad_key_numbers_size"
- android:fontFamily="sans-serif-light"
- android:layout_centerInParent="true" />
- <ImageView
- android:id="@+id/dialpad_key_voicemail"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@drawable/ic_dial_action_vm"
- android:paddingRight="11dp"
- android:layout_alignBaseline="@id/dialpad_key_number"
- android:baselineAlignBottom="true"
- android:layout_alignParentRight="true" />
+ android:layout_height="match_parent"
+ android:layout_gravity="center" >
+ <TextView
+ android:id="@+id/dialpad_key_number"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/dialpad_primary_text_color"
+ android:textSize="@dimen/dialpad_key_numbers_size"
+ android:fontFamily="sans-serif-light"/>
+ <ImageView
+ android:id="@+id/dialpad_key_voicemail"
+ android:layout_width="@dimen/dialpad_key_letters_width"
+ android:layout_height="wrap_content"
+ android:src="@drawable/ic_dial_action_vm"
+ android:paddingLeft="11dp"
+ android:scaleType="fitStart"
+ android:baselineAlignBottom="true" />
+ </LinearLayout>
</com.android.dialer.dialpad.DialpadKeyButton>
<include layout="@layout/dialpad_key" android:id="@+id/two"/>
<include layout="@layout/dialpad_key" android:id="@+id/three"/>
@@ -90,7 +93,8 @@
android:textColor="@color/dialpad_secondary_text_color"
android:textSize="@dimen/dialpad_key_special_characters_size"
android:fontFamily="sans-serif-light"
- android:layout_centerInParent="true" />
+ android:paddingRight="@dimen/dialpad_key_letters_width"
+ android:layout_gravity="center" />
</com.android.dialer.dialpad.DialpadKeyButton>
<include layout="@layout/dialpad_key" android:id="@+id/zero"/>
<com.android.dialer.dialpad.DialpadKeyButton
@@ -105,7 +109,8 @@
android:textColor="@color/dialpad_secondary_text_color"
android:textSize="@dimen/dialpad_key_special_characters_size"
android:fontFamily="sans-serif-light"
- android:layout_centerInParent="true" />
+ android:paddingRight="@dimen/dialpad_key_letters_width"
+ android:layout_gravity="center" />
</com.android.dialer.dialpad.DialpadKeyButton>
</TableRow>
</TableLayout>
diff --git a/res/layout/dialpad_key.xml b/res/layout/dialpad_key.xml
index b204c20..074e023 100644
--- a/res/layout/dialpad_key.xml
+++ b/res/layout/dialpad_key.xml
@@ -19,24 +19,26 @@
xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/DialtactsDialpadButtonStyle"
android:clickable="true" >
- <TextView
- android:id="@+id/dialpad_key_number"
+ <LinearLayout
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="@color/dialpad_primary_text_color"
- android:textSize="@dimen/dialpad_key_numbers_size"
- android:fontFamily="sans-serif-light"
- android:layout_centerInParent="true"
- />
- <TextView
- android:id="@+id/dialpad_key_letters"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="@color/dialpad_secondary_text_color"
- android:textSize="@dimen/dialpad_key_letters_size"
- android:paddingRight="11dp"
- android:layout_alignBaseline="@id/dialpad_key_number"
- android:fontFamily="sans-serif-light"
- android:layout_alignParentRight="true"
- />
+ android:layout_height="match_parent"
+ android:layout_gravity="center">
+ <TextView
+ android:id="@+id/dialpad_key_number"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/dialpad_primary_text_color"
+ android:textSize="@dimen/dialpad_key_numbers_size"
+ android:fontFamily="sans-serif-light"
+ />
+ <TextView
+ android:id="@+id/dialpad_key_letters"
+ android:layout_width="@dimen/dialpad_key_letters_width"
+ android:layout_height="wrap_content"
+ android:textColor="@color/dialpad_secondary_text_color"
+ android:textSize="@dimen/dialpad_key_letters_size"
+ android:paddingLeft="11dp"
+ android:fontFamily="sans-serif-light"
+ />
+ </LinearLayout>
</com.android.dialer.dialpad.DialpadKeyButton>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index ef45e4c..87b0c1d 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -52,7 +52,10 @@
<!-- Text dimensions for dialpad keys -->
<dimen name="dialpad_key_numbers_size">40dp</dimen>
<dimen name="dialpad_key_letters_size">11dp</dimen>
+ <dimen name="dialpad_key_plus_size">15dp</dimen>
<dimen name="dialpad_key_special_characters_size">25dp</dimen>
+ <dimen name="dialpad_key_letters_width">41dp</dimen>
+
<dimen name="fake_action_bar_height">48dp</dimen>
<!-- Min with of fake menu buttons, which should be same as ActionBar's one -->
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index c976a9e..4066122 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -53,6 +53,7 @@
import android.util.AttributeSet;
import android.util.DisplayMetrics;
import android.util.Log;
+import android.util.TypedValue;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -626,10 +627,12 @@
R.string.dialpad_8_letters, R.string.dialpad_9_letters,
R.string.dialpad_star_letters, R.string.dialpad_pound_letters};
+ final Resources resources = getResources();
+
DialpadKeyButton dialpadKey;
TextView numberView;
TextView lettersView;
- final Resources resources = getResources();
+
for (int i = 0; i < buttonIds.length; i++) {
dialpadKey = (DialpadKeyButton) fragmentView.findViewById(buttonIds[i]);
dialpadKey.setLayoutParams(new TableRow.LayoutParams(
@@ -642,6 +645,10 @@
dialpadKey.setContentDescription(numberString);
if (lettersView != null) {
lettersView.setText(resources.getString(letterIds[i]));
+ if (buttonIds[i] == R.id.zero) {
+ lettersView.setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(
+ R.dimen.dialpad_key_plus_size));
+ }
}
}
diff --git a/src/com/android/dialer/dialpad/DialpadKeyButton.java b/src/com/android/dialer/dialpad/DialpadKeyButton.java
index 9aae631..9a20993 100644
--- a/src/com/android/dialer/dialpad/DialpadKeyButton.java
+++ b/src/com/android/dialer/dialpad/DialpadKeyButton.java
@@ -25,7 +25,7 @@
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityManager;
import android.view.accessibility.AccessibilityNodeInfo;
-import android.widget.RelativeLayout;
+import android.widget.FrameLayout;
/**
* Custom class for dialpad buttons.
@@ -33,7 +33,7 @@
* This class implements lift-to-type interaction when touch exploration is
* enabled.
*/
-public class DialpadKeyButton extends RelativeLayout {
+public class DialpadKeyButton extends FrameLayout {
/** Accessibility manager instance used to check touch exploration state. */
private AccessibilityManager mAccessibilityManager;
