diff options
author | Nancy Chen <nancychen@google.com> | 2014-07-29 14:34:52 -0700 |
---|---|---|
committer | Nancy Chen <nancychen@google.com> | 2014-07-29 14:39:07 -0700 |
commit | 9764a8206a5b5771e13fdfaaf467adbe5d3a8b24 (patch) | |
tree | 37f635c415ee004f3c2b2a185928cdeb63058980 /res/layout | |
parent | f4d66dc977378701fcb26bef879da0d457dde956 (diff) | |
download | packages_apps_PhoneCommon-9764a8206a5b5771e13fdfaaf467adbe5d3a8b24.tar.gz packages_apps_PhoneCommon-9764a8206a5b5771e13fdfaaf467adbe5d3a8b24.tar.bz2 packages_apps_PhoneCommon-9764a8206a5b5771e13fdfaaf467adbe5d3a8b24.zip |
Shift padding between letters and numbers move overflow icon left.
Increase padding between numbers and subtext for all numbers except zero
and "+" which decrease the margin. Also move overflow icon to the left.
Bug: 16655840
Change-Id: Ic5187e0c82eb2433a89165d201e8d406b6d0d5a4
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/dialpad.xml | 4 | ||||
-rw-r--r-- | res/layout/dialpad_key_zero.xml | 37 | ||||
-rw-r--r-- | res/layout/dialpad_view.xml | 2 |
3 files changed, 39 insertions, 4 deletions
diff --git a/res/layout/dialpad.xml b/res/layout/dialpad.xml index 1fc1f6c..6368279 100644 --- a/res/layout/dialpad.xml +++ b/res/layout/dialpad.xml @@ -90,9 +90,7 @@ style="@style/DialpadKeyStarStyle" /> </LinearLayout> </com.android.phone.common.dialpad.DialpadKeyButton> - <include layout="@layout/dialpad_key" - android:id="@+id/zero" - style="@style/DialpadKeyButtonStyle" /> + <include layout="@layout/dialpad_key_zero" /> <com.android.phone.common.dialpad.DialpadKeyButton android:id="@+id/pound" style="@style/DialpadKeyButtonStyle"> diff --git a/res/layout/dialpad_key_zero.xml b/res/layout/dialpad_key_zero.xml new file mode 100644 index 0000000..11805f1 --- /dev/null +++ b/res/layout/dialpad_key_zero.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + 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 --> +<com.android.phone.common.dialpad.DialpadKeyButton + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/zero" + style="@style/DialpadKeyButtonStyle" > + + <LinearLayout style="@style/DialpadKeyInternalLayoutStyle"> + + <!-- 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.phone.common.dialpad.DialpadTextView + android:id="@+id/dialpad_key_number" + style="@style/DialpadBottomKeyNumberStyle" /> + + <TextView + android:id="@+id/dialpad_key_letters" + style="@style/DialpadKeyLettersStyle" /> + </LinearLayout> +</com.android.phone.common.dialpad.DialpadKeyButton> diff --git a/res/layout/dialpad_view.xml b/res/layout/dialpad_view.xml index c7413b0..1552ab3 100644 --- a/res/layout/dialpad_view.xml +++ b/res/layout/dialpad_view.xml @@ -39,7 +39,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_margin="@dimen/dialpad_overflow_margin" - android:paddingLeft="@dimen/dialpad_digits_padding" + android:paddingLeft="@dimen/dialpad_digits_menu_left_padding" android:paddingRight="@dimen/dialpad_digits_menu_right_padding" android:contentDescription="@string/description_dialpad_overflow" android:gravity="center" |