diff options
| author | Yorke Lee <yorkelee@google.com> | 2013-10-08 07:40:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-08 07:40:51 -0700 |
| commit | c167bc5a2c141be360c43a1afe64882c3e543d7c (patch) | |
| tree | f31202d4a2981a83e53b46e79614644fc870c32a /res | |
| parent | cf859e0f2a33d58a4264a2291e0fb2b631e6d1f7 (diff) | |
| parent | e63103a7418d1f3c0ee794d14a4c80b2ca7c3247 (diff) | |
am e63103a7: Merge "Update dialer actionbar icon and dimensions" into klp-dev
* commit 'e63103a7418d1f3c0ee794d14a4c80b2ca7c3247':
Update dialer actionbar icon and dimensions
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable-hdpi/ic_menu_dialpad_dk.png | bin | 1467 -> 1474 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/ic_menu_dialpad_dk.png | bin | 1061 -> 1088 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/ic_menu_dialpad_dk.png | bin | 1919 -> 1957 bytes | |||
| -rw-r--r-- | res/drawable-xxhdpi/ic_menu_dialpad_dk.png | bin | 2393 -> 2044 bytes | |||
| -rw-r--r-- | res/layout/dialpad_fragment.xml | 5 | ||||
| -rw-r--r-- | res/values/dimens.xml | 6 |
6 files changed, 4 insertions, 7 deletions
diff --git a/res/drawable-hdpi/ic_menu_dialpad_dk.png b/res/drawable-hdpi/ic_menu_dialpad_dk.png Binary files differindex 984d6fa11..55f547750 100644 --- a/res/drawable-hdpi/ic_menu_dialpad_dk.png +++ b/res/drawable-hdpi/ic_menu_dialpad_dk.png diff --git a/res/drawable-mdpi/ic_menu_dialpad_dk.png b/res/drawable-mdpi/ic_menu_dialpad_dk.png Binary files differindex c55571a48..a7dcd24bf 100644 --- a/res/drawable-mdpi/ic_menu_dialpad_dk.png +++ b/res/drawable-mdpi/ic_menu_dialpad_dk.png diff --git a/res/drawable-xhdpi/ic_menu_dialpad_dk.png b/res/drawable-xhdpi/ic_menu_dialpad_dk.png Binary files differindex 74a7032f7..bd8085978 100644 --- a/res/drawable-xhdpi/ic_menu_dialpad_dk.png +++ b/res/drawable-xhdpi/ic_menu_dialpad_dk.png diff --git a/res/drawable-xxhdpi/ic_menu_dialpad_dk.png b/res/drawable-xxhdpi/ic_menu_dialpad_dk.png Binary files differindex de9387d81..09cc2f8bf 100644 --- a/res/drawable-xxhdpi/ic_menu_dialpad_dk.png +++ b/res/drawable-xxhdpi/ic_menu_dialpad_dk.png diff --git a/res/layout/dialpad_fragment.xml b/res/layout/dialpad_fragment.xml index dc2835229..32b1d6094 100644 --- a/res/layout/dialpad_fragment.xml +++ b/res/layout/dialpad_fragment.xml @@ -41,7 +41,7 @@ android:id="@+id/digits_container" android:layout_width="match_parent" android:layout_height="0px" - android:layout_weight="@integer/dialpad_layout_weight_digits_new" + android:layout_weight="@integer/dialpad_layout_weight_digits" android:layout_marginTop="@dimen/dialpad_vertical_margin" android:gravity="center" > @@ -81,8 +81,7 @@ <LinearLayout android:id="@+id/dialButtonContainer" android:layout_width="match_parent" - android:layout_height="0px" - android:layout_weight="@integer/dialpad_layout_weight_additional_buttons" + android:layout_height="@dimen/fake_action_bar_height" android:layout_gravity="center_horizontal" android:background="@color/dialpad_primary_text_color" android:layoutDirection="locale"> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 30adc43ed..e4e847c32 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -47,10 +47,8 @@ <!-- Layout weight values for dialpad screen. These layouts will be used in one LinearLayout (dialpad_fragment.xml), configuring dialpad screen's vertical ratio. --> - <integer name="dialpad_layout_weight_digits">20</integer> - <integer name="dialpad_layout_weight_digits_new">15</integer> + <integer name="dialpad_layout_weight_digits">15</integer> <integer name="dialpad_layout_weight_dialpad">65</integer> - <integer name="dialpad_layout_weight_additional_buttons">15</integer> <!-- Text dimensions for dialpad keys --> <dimen name="dialpad_key_numbers_size">40dp</dimen> @@ -60,7 +58,7 @@ <dimen name="dialpad_key_letters_width">41dp</dimen> - <dimen name="fake_action_bar_height">48dp</dimen> + <dimen name="fake_action_bar_height">60dp</dimen> <!-- Min with of fake menu buttons, which should be same as ActionBar's one --> <dimen name="fake_menu_button_min_width">56dp</dimen> |
