Make dialpad dimension values resizeable.
The dialpad edit text and numbers should be resizeable to accommodate
smaller devices. Also moved letters and voicemail icon to be vertically
centered.
Bug: 18122087
Change-Id: I3560f1b4a3322bde83c7fd151742a226514f762e
diff --git a/res/layout-land/dialpad_key.xml b/res/layout-land/dialpad_key.xml
index 29e6bf1..8342ba0 100644
--- a/res/layout-land/dialpad_key.xml
+++ b/res/layout-land/dialpad_key.xml
@@ -38,6 +38,6 @@
android:id="@+id/dialpad_key_letters"
style="@style/DialpadKeyLettersStyle"
android:layout_width="@dimen/dialpad_key_text_width"
- android:layout_gravity="right|bottom" />
+ android:layout_gravity="right|center" />
</LinearLayout>
</com.android.phone.common.dialpad.DialpadKeyButton>
diff --git a/res/layout-land/dialpad_key_one.xml b/res/layout-land/dialpad_key_one.xml
index bfbbdf9..fd4291b 100644
--- a/res/layout-land/dialpad_key_one.xml
+++ b/res/layout-land/dialpad_key_one.xml
@@ -31,11 +31,10 @@
<FrameLayout
android:layout_width="@dimen/dialpad_key_text_width"
android:layout_height="wrap_content"
- android:layout_gravity="left|bottom" >
+ android:layout_gravity="left|center" >
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingTop="@dimen/dialpad_voicemail_icon_padding_top"
android:id="@+id/dialpad_key_voicemail"
android:src="@drawable/ic_dialpad_voicemail"
android:scaleType="fitCenter"
diff --git a/res/layout/dialpad_view.xml b/res/layout/dialpad_view.xml
index 12b1a68..67ec58f 100644
--- a/res/layout/dialpad_view.xml
+++ b/res/layout/dialpad_view.xml
@@ -65,7 +65,7 @@
<LinearLayout
android:id="@+id/digits_container"
android:layout_width="match_parent"
- android:layout_height="@dimen/dialpad_digits_height"
+ android:layout_height="@dimen/dialpad_digits_adjustable_height"
android:orientation="horizontal">
<ImageButton android:id="@+id/dialpad_overflow"
@@ -92,13 +92,13 @@
android:gravity="center"
android:background="@android:color/transparent"
android:maxLines="1"
- android:textSize="@dimen/dialpad_digits_text_size"
+ android:textSize="@dimen/dialpad_digits_adjustable_text_size"
android:freezesText="true"
android:focusableInTouchMode="true"
android:cursorVisible="false"
android:textColor="@color/dialpad_digits_text_color"
android:textCursorDrawable="@null"
- android:fontFamily="sans-serif-light"
+ android:fontFamily="sans-serif"
android:textStyle="normal"
ex:resizing_text_min_size="@dimen/dialpad_digits_text_min_size" />
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 30f34e3..0c342ba 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -16,14 +16,17 @@
<resources>
<!-- Text dimensions for dialpad keys -->
- <dimen name="dialpad_key_numbers_size">36sp</dimen>
+ <dimen name="dialpad_key_numbers_size">@dimen/dialpad_key_numbers_default_size</dimen>
+ <dimen name="dialpad_key_numbers_default_size">36sp</dimen>
<dimen name="dialpad_key_letters_size">12sp</dimen>
<dimen name="dialpad_key_pound_size">23sp</dimen>
<dimen name="dialpad_key_star_size">36sp</dimen>
<dimen name="dialpad_key_height">64dp</dimen>
- <dimen name="dialpad_key_number_margin_bottom">3dp</dimen>
+ <dimen name="dialpad_key_number_margin_bottom">@dimen/dialpad_key_number_default_margin_bottom</dimen>
+ <dimen name="dialpad_key_number_default_margin_bottom">3dp</dimen>
<!-- Zero key should have less space between self and text because "+" is smaller -->
- <dimen name="dialpad_zero_key_number_margin_bottom">1dp</dimen>
+ <dimen name="dialpad_zero_key_number_margin_bottom">@dimen/dialpad_zero_key_number_default_margin_bottom</dimen>
+ <dimen name="dialpad_zero_key_number_default_margin_bottom">1dp</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">65dp</dimen>
@@ -32,6 +35,9 @@
<dimen name="dialpad_digits_text_size">34sp</dimen>
<dimen name="dialpad_digits_text_min_size">24sp</dimen>
<dimen name="dialpad_digits_height">60dp</dimen>
+ <!-- Provide adjustable dimensions so that different apps can use different dialpad sizes. -->
+ <dimen name="dialpad_digits_adjustable_text_size">@dimen/dialpad_digits_text_size</dimen>
+ <dimen name="dialpad_digits_adjustable_height">@dimen/dialpad_digits_height</dimen>
<dimen name="dialpad_digits_padding">16dp</dimen>
<dimen name="dialpad_digits_menu_left_padding">8dp</dimen>
<dimen name="dialpad_digits_menu_right_padding">10dp</dimen>