diff options
Diffstat (limited to 'java/com/android/dialer/dialpadview/res/layout-land')
5 files changed, 106 insertions, 89 deletions
diff --git a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key.xml b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key.xml index 941fdb2ec..b126f723f 100644 --- a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key.xml +++ b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key.xml @@ -16,29 +16,28 @@ <!-- A layout representing a single key in the dialpad --> <com.android.dialer.dialpadview.DialpadKeyButton - xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/DialpadKeyButtonStyle"> + xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/DialpadKeyButtonStyle"> <LinearLayout - style="@style/DialpadKeyInternalLayoutStyle" - android:layout_gravity="right|center_vertical" - android:baselineAligned="false" - android:orientation="horizontal"> - - <!-- 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 --> - - <com.android.dialer.dialpadview.DialpadTextView - android:id="@+id/dialpad_key_number" - style="@style/DialpadKeyNumberStyle" - android:layout_marginBottom="0dp" - android:layout_marginRight="@dimen/dialpad_key_margin_right" - android:layout_gravity="right"/> + style="@style/DialpadKeyInternalLayoutStyle" + android:layout_gravity="right|center_vertical" + android:baselineAligned="false" + android:orientation="horizontal"> + + <FrameLayout + android:layout_width="@dimen/dialpad_key_number_width" + android:layout_height="wrap_content" + android:layout_marginRight="@dimen/dialpad_key_margin_right"> + <com.android.dialer.dialpadview.DialpadTextView + android:id="@+id/dialpad_key_number" + style="@style/DialpadKeyNumberStyle"/> + </FrameLayout> <TextView - android:id="@+id/dialpad_key_letters" - style="@style/DialpadKeyLettersStyle" - android:layout_width="@dimen/dialpad_key_text_width" - android:layout_gravity="right|center"/> + android:id="@+id/dialpad_key_letters" + style="@style/DialpadKeyLettersStyle" + android:layout_width="@dimen/dialpad_key_text_width" + android:layout_gravity="center"/> </LinearLayout> </com.android.dialer.dialpadview.DialpadKeyButton> diff --git a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml index 135624681..5023413ae 100644 --- a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml +++ b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml @@ -14,31 +14,36 @@ limitations under the License. --> <com.android.dialer.dialpadview.DialpadKeyButton - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/one" - style="@style/DialpadKeyButtonStyle"> + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/one" + style="@style/DialpadKeyButtonStyle"> + <LinearLayout - style="@style/DialpadKeyInternalLayoutStyle" - android:layout_gravity="right|center_vertical" - android:baselineAligned="false" - android:orientation="horizontal"> - <com.android.dialer.dialpadview.DialpadTextView - android:id="@+id/dialpad_key_number" - style="@style/DialpadKeyNumberStyle" - android:layout_marginBottom="0dp" - android:layout_marginRight="@dimen/dialpad_key_one_margin_right" - android:layout_gravity="right"/> + style="@style/DialpadKeyInternalLayoutStyle" + android:layout_gravity="right|center_vertical" + android:baselineAligned="false" + android:orientation="horizontal"> + + <FrameLayout + android:layout_width="@dimen/dialpad_key_number_width" + android:layout_height="wrap_content" + android:layout_marginRight="@dimen/dialpad_key_margin_right"> + <com.android.dialer.dialpadview.DialpadTextView + android:id="@+id/dialpad_key_number" + style="@style/DialpadKeyNumberStyle"/> + </FrameLayout> + <FrameLayout - android:layout_width="@dimen/dialpad_key_text_width" - android:layout_height="wrap_content" - android:layout_gravity="left|center"> + android:layout_width="@dimen/dialpad_key_text_width" + android:layout_height="wrap_content" + android:layout_gravity="left|center"> <ImageView - android:id="@+id/dialpad_key_voicemail" - android:layout_width="wrap_content" - android:layout_height="@dimen/dialpad_voicemail_icon_size" - android:scaleType="fitCenter" - android:src="@drawable/quantum_ic_voicemail_white_24" - android:tint="@color/dialpad_voicemail_tint"/> + android:id="@+id/dialpad_key_voicemail" + android:layout_width="wrap_content" + android:layout_height="@dimen/dialpad_voicemail_icon_size" + android:scaleType="fitCenter" + android:src="@drawable/quantum_ic_voicemail_white_24" + android:tint="@color/dialpad_voicemail_tint"/> </FrameLayout> </LinearLayout> </com.android.dialer.dialpadview.DialpadKeyButton> diff --git a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_pound.xml b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_pound.xml index 98c353128..a3e0c7c14 100644 --- a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_pound.xml +++ b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_pound.xml @@ -14,20 +14,27 @@ limitations under the License. --> <com.android.dialer.dialpadview.DialpadKeyButton - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/pound" - style="@style/DialpadKeyButtonStyle"> + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/pound" + style="@style/DialpadKeyButtonStyle"> + <LinearLayout - style="@style/DialpadKeyInternalLayoutStyle" - android:layout_gravity="center_vertical|right" - android:orientation="horizontal"> - <com.android.dialer.dialpadview.DialpadTextView - android:id="@id/dialpad_key_number" - style="@style/DialpadKeyPoundStyle" - android:layout_width="@dimen/dialpad_key_number_width" - android:layout_marginRight="@dimen/dialpad_key_margin_right"/> + style="@style/DialpadKeyInternalLayoutStyle" + android:layout_gravity="right|center_vertical" + android:baselineAligned="false" + android:orientation="horizontal"> + + <FrameLayout + android:layout_width="@dimen/dialpad_key_number_width" + android:layout_height="wrap_content" + android:layout_marginRight="@dimen/dialpad_key_margin_right"> + <com.android.dialer.dialpadview.DialpadTextView + android:id="@id/dialpad_key_number" + style="@style/DialpadKeyPoundStyle"/> + </FrameLayout> + <View - style="@style/DialpadKeyLettersStyle" - android:layout_width="@dimen/dialpad_key_text_width"/> + style="@style/DialpadKeyLettersStyle" + android:layout_width="@dimen/dialpad_key_text_width"/> </LinearLayout> </com.android.dialer.dialpadview.DialpadKeyButton> diff --git a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_star.xml b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_star.xml index b91c71680..18dc1cb49 100644 --- a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_star.xml +++ b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_star.xml @@ -14,20 +14,27 @@ limitations under the License. --> <com.android.dialer.dialpadview.DialpadKeyButton - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/star" - style="@style/DialpadKeyButtonStyle"> + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/star" + style="@style/DialpadKeyButtonStyle"> + <LinearLayout - style="@style/DialpadKeyInternalLayoutStyle" - android:layout_gravity="center_vertical|right" - android:orientation="horizontal"> - <com.android.dialer.dialpadview.DialpadTextView - android:id="@id/dialpad_key_number" - style="@style/DialpadKeyStarStyle" - android:layout_width="@dimen/dialpad_key_number_width" - android:layout_marginRight="@dimen/dialpad_key_margin_right"/> + style="@style/DialpadKeyInternalLayoutStyle" + android:layout_gravity="right|center_vertical" + android:baselineAligned="false" + android:orientation="horizontal"> + + <FrameLayout + android:layout_width="@dimen/dialpad_key_number_width" + android:layout_height="wrap_content" + android:layout_marginRight="@dimen/dialpad_key_margin_right"> + <com.android.dialer.dialpadview.DialpadTextView + android:id="@id/dialpad_key_number" + style="@style/DialpadKeyStarStyle"/> + </FrameLayout> + <View - style="@style/DialpadKeyLettersStyle" - android:layout_width="@dimen/dialpad_key_text_width"/> + style="@style/DialpadKeyLettersStyle" + android:layout_width="@dimen/dialpad_key_text_width"/> </LinearLayout> </com.android.dialer.dialpadview.DialpadKeyButton> diff --git a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_zero.xml b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_zero.xml index d885ddf05..4c46447d4 100644 --- a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_zero.xml +++ b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_zero.xml @@ -14,31 +14,30 @@ limitations under the License. --> -<!-- A layout representing the zero key in the dialpad, with the plus sign shifted up because it is - smaller than a regular letter --> +<!-- A layout representing key "0" in the dialpad --> <com.android.dialer.dialpadview.DialpadKeyButton - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/zero" - style="@style/DialpadKeyButtonStyle"> + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/zero" + style="@style/DialpadKeyButtonStyle"> <LinearLayout - style="@style/DialpadKeyInternalLayoutStyle" - android:layout_gravity="right|center_vertical" - android:baselineAligned="false" - android:orientation="horizontal"> - - <!-- 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 --> - - <com.android.dialer.dialpadview.DialpadTextView - android:id="@+id/dialpad_key_number" - style="@style/DialpadBottomKeyNumberStyle" - android:layout_marginBottom="0dp" - android:layout_marginRight="@dimen/dialpad_key_margin_right"/> + style="@style/DialpadKeyInternalLayoutStyle" + android:layout_gravity="right|center_vertical" + android:baselineAligned="false" + android:orientation="horizontal"> + + <FrameLayout + android:layout_width="@dimen/dialpad_key_number_width" + android:layout_height="wrap_content" + android:layout_marginRight="@dimen/dialpad_key_margin_right"> + <com.android.dialer.dialpadview.DialpadTextView + android:id="@+id/dialpad_key_number" + style="@style/DialpadBottomKeyNumberStyle"/> + </FrameLayout> <TextView - android:id="@+id/dialpad_key_letters" - style="@style/DialpadKeyLettersStyle" - android:layout_width="@dimen/dialpad_key_text_width"/> + android:id="@+id/dialpad_key_letters" + style="@style/DialpadKeyLettersStyle" + android:layout_width="@dimen/dialpad_key_text_width"/> </LinearLayout> </com.android.dialer.dialpadview.DialpadKeyButton> |