diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-10-30 16:55:44 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-30 16:55:44 +0000 |
commit | cde445645e34e8a6a4b2cba48565c221a6596e85 (patch) | |
tree | 9c668c93b4008bb9c4bb2cf8bf4da1e68898e8f2 /java/com/android/dialer/dialpadview/res/layout | |
parent | 34582db05d06eb76c88ca95452199ec728c9bee3 (diff) | |
parent | ec1a970dec22d68773f8ae9dbde6f17df6154e03 (diff) |
Merge changes Ic7360019,I9b60657c
* changes:
internal change
Make dialpad key alignment responsive to font size.
Diffstat (limited to 'java/com/android/dialer/dialpadview/res/layout')
5 files changed, 79 insertions, 57 deletions
diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_key.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_key.xml index 77e4fc53a..6c87cd2b4 100644 --- a/java/com/android/dialer/dialpadview/res/layout/dialpad_key.xml +++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_key.xml @@ -14,22 +14,26 @@ limitations under the License. --> -<!-- A layout representing a single key in the dialpad --> +<!-- A layout representing each of keys "2" ~ "9" 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"> - - <!-- 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 --> + <LinearLayout + android:id="@+id/dialpad_key_layout" + style="@style/DialpadKeyInternalLayoutStyle"> <com.android.dialer.dialpadview.DialpadTextView - android:id="@+id/dialpad_key_number" - style="@style/DialpadKeyNumberStyle"/> + android:id="@+id/dialpad_key_number" + style="@style/DialpadKeyNumberStyle"/> + + <LinearLayout + android:id="@+id/dialpad_key_icon_or_letters_layout" + style="@style/DialpadKeyInternalLayoutStyle"> - <TextView - android:id="@+id/dialpad_key_letters" - style="@style/DialpadKeyLettersStyle"/> + <TextView + android:id="@+id/dialpad_key_letters" + style="@style/DialpadKeyLettersStyle"/> + </LinearLayout> </LinearLayout> </com.android.dialer.dialpadview.DialpadKeyButton> diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml index 4401c5bbd..599c2d8e6 100644 --- a/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml +++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml @@ -13,29 +13,40 @@ See the License for the specific language governing permissions and limitations under the License. --> + +<!-- A layout representing key "1" in the dialpad --> <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 - android:layout_marginTop="1dp" + android:id="@+id/dialpad_key_layout" style="@style/DialpadKeyInternalLayoutStyle"> + <com.android.dialer.dialpadview.DialpadTextView - android:id="@+id/dialpad_key_number" - style="@style/DialpadKeyNumberStyle"/> - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content"> + android:id="@+id/dialpad_key_number" + style="@style/DialpadKeyNumberStyle"/> + + <LinearLayout + android:id="@+id/dialpad_key_icon_or_letters_layout" + style="@style/DialpadKeyInternalLayoutStyle"> + + <!-- + A placeholder to make the horizontal center line of the voice mail icon lined up with + those of the other buttons in the same row + --> + <View + android:layout_width="match_parent" + android:layout_height="1dp"/> + <ImageView - android:id="@+id/dialpad_key_voicemail" - android:layout_width="wrap_content" - android:layout_height="@dimen/dialpad_voicemail_icon_size" - android:layout_centerInParent="true" - android:scaleType="fitCenter" - android:src="@drawable/quantum_ic_voicemail_white_24" - android:tint="?attr/dialpad_voicemail_tint"/> - <!-- Place empty text view so vertical height is same as other dialpad keys. --> - <TextView style="@style/DialpadKeyLettersStyle"/> - </RelativeLayout> + 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="?attr/dialpad_voicemail_tint"/> + </LinearLayout> </LinearLayout> </com.android.dialer.dialpadview.DialpadKeyButton> diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_key_pound.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_key_pound.xml index d37a6aa78..5e47ac092 100644 --- a/java/com/android/dialer/dialpadview/res/layout/dialpad_key_pound.xml +++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_key_pound.xml @@ -13,14 +13,19 @@ See the License for the specific language governing permissions and limitations under the License. --> + +<!-- A layout representing key "#" in the dialpad --> <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:id="@+id/dialpad_key_layout" + style="@style/DialpadKeyInternalLayoutStyle"> + <com.android.dialer.dialpadview.DialpadTextView - android:id="@id/dialpad_key_number" - style="@style/DialpadKeyPoundStyle"/> + android:id="@id/dialpad_key_number" + style="@style/DialpadKeyPoundStyle"/> </LinearLayout> </com.android.dialer.dialpadview.DialpadKeyButton> diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_key_star.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_key_star.xml index d288475d0..6897d26e7 100644 --- a/java/com/android/dialer/dialpadview/res/layout/dialpad_key_star.xml +++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_key_star.xml @@ -13,14 +13,19 @@ See the License for the specific language governing permissions and limitations under the License. --> + +<!-- A layout representing key "*" in the dialpad --> <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:id="@+id/dialpad_key_layout" + style="@style/DialpadKeyInternalLayoutStyle"> + <com.android.dialer.dialpadview.DialpadTextView - android:id="@+id/dialpad_key_number" - style="@style/DialpadKeyStarStyle"/> + android:id="@+id/dialpad_key_number" + style="@style/DialpadKeyStarStyle"/> </LinearLayout> </com.android.dialer.dialpadview.DialpadKeyButton> diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_key_zero.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_key_zero.xml index 943ae48dd..8d9c7b216 100644 --- a/java/com/android/dialer/dialpadview/res/layout/dialpad_key_zero.xml +++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_key_zero.xml @@ -14,24 +14,21 @@ 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"> - - <!-- 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 --> + <LinearLayout + android:id="@+id/dialpad_key_layout" + style="@style/DialpadKeyInternalLayoutStyle"> <com.android.dialer.dialpadview.DialpadTextView - android:id="@+id/dialpad_key_number" - style="@style/DialpadBottomKeyNumberStyle"/> - + android:id="@+id/dialpad_key_number" + style="@style/DialpadBottomKeyNumberStyle"/> <TextView - android:id="@+id/dialpad_key_letters" - style="@style/DialpadKeyLettersStyle"/> + android:id="@+id/dialpad_key_letters" + style="@style/DialpadKeyLettersStyle"/> </LinearLayout> </com.android.dialer.dialpadview.DialpadKeyButton> |