diff options
| author | linyuh <linyuh@google.com> | 2017-10-27 14:19:14 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-10-30 08:27:37 -0700 |
| commit | e39af763e7bf598306feab4a3d2e1164c9f0421a (patch) | |
| tree | 21463fedda5df8976504b2bba4e04e01de21a773 /java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml | |
| parent | 34582db05d06eb76c88ca95452199ec728c9bee3 (diff) | |
Make dialpad key alignment responsive to font size.
In portrait mode, we surround the icon and letters with a linear layout so that we can adjust its height.
In landscape mode, we add a horizontal placeholder to each key's layout so that we can adjust its width.
This approach was put forward by Ryan Oldenburg (roldenburg@).
Bug: 30215380
Test: Manual
PiperOrigin-RevId: 173717443
Change-Id: I9b60657ca20d371a60c303a9683578663fc28a09
Diffstat (limited to 'java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml')
| -rw-r--r-- | java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml | 20 |
1 files changed, 15 insertions, 5 deletions
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 5023413ae..2f2e725d5 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 @@ -13,12 +13,15 @@ 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"> <LinearLayout + android:id="@+id/dialpad_key_layout" style="@style/DialpadKeyInternalLayoutStyle" android:layout_gravity="right|center_vertical" android:baselineAligned="false" @@ -33,10 +36,10 @@ style="@style/DialpadKeyNumberStyle"/> </FrameLayout> - <FrameLayout - android:layout_width="@dimen/dialpad_key_text_width" - android:layout_height="wrap_content" - android:layout_gravity="left|center"> + <LinearLayout + android:id="@+id/dialpad_key_icon_or_letters_layout" + style="@style/DialpadKeyInternalLayoutStyle"> + <ImageView android:id="@+id/dialpad_key_voicemail" android:layout_width="wrap_content" @@ -44,6 +47,13 @@ android:scaleType="fitCenter" android:src="@drawable/quantum_ic_voicemail_white_24" android:tint="@color/dialpad_voicemail_tint"/> - </FrameLayout> + </LinearLayout> + + <!-- A placeholder to make the width the same as other dialpad keys. --> + <View + android:id="@+id/dialpad_key_horizontal_placeholder" + android:layout_width="0dp" + android:layout_height="match_parent"/> </LinearLayout> + </com.android.dialer.dialpadview.DialpadKeyButton> |