From 8e2a0682b3380be25cdc4e3fafc0731087055dc1 Mon Sep 17 00:00:00 2001 From: Yorke Lee Date: Tue, 30 Jul 2013 11:14:25 -0700 Subject: Dialpad modifications to match the rest of the redlines * Reduced size of star and pound keys * Made star and pound key gray * Add voicemail image view * Add light versions of menu assets * Renamed other menu assets to be more consistent * Assign proper menu items to dialpad fragment Change-Id: I67f2e7eecb177fc8ab7b4bc9b2855b385c622a7f --- res/drawable-hdpi/ic_dial_action_vm.png | Bin 0 -> 560 bytes res/drawable-hdpi/ic_dialer_menu_dialpad_dk.png | Bin 747 -> 0 bytes res/drawable-hdpi/ic_dialer_menu_history_dk.png | Bin 1605 -> 0 bytes res/drawable-hdpi/ic_menu_dialpad_dk.png | Bin 0 -> 747 bytes res/drawable-hdpi/ic_menu_history_dk.png | Bin 0 -> 1605 bytes res/drawable-hdpi/ic_menu_history_lt.png | Bin 0 -> 1565 bytes res/drawable-hdpi/ic_menu_overflow_dark.png | Bin 647 -> 0 bytes res/drawable-hdpi/ic_menu_overflow_dk.png | Bin 0 -> 647 bytes res/drawable-hdpi/ic_menu_overflow_lt.png | Bin 0 -> 643 bytes res/drawable-mdpi/ic_dial_action_vm.png | Bin 0 -> 440 bytes res/drawable-mdpi/ic_dialer_menu_dialpad_dk.png | Bin 897 -> 0 bytes res/drawable-mdpi/ic_dialer_menu_history_dk.png | Bin 1107 -> 0 bytes res/drawable-mdpi/ic_menu_dialpad_dk.png | Bin 0 -> 897 bytes res/drawable-mdpi/ic_menu_history_dk.png | Bin 0 -> 1107 bytes res/drawable-mdpi/ic_menu_history_lt.png | Bin 0 -> 1086 bytes res/drawable-mdpi/ic_menu_overflow_dark.png | Bin 616 -> 0 bytes res/drawable-mdpi/ic_menu_overflow_dk.png | Bin 0 -> 616 bytes res/drawable-mdpi/ic_menu_overflow_lt.png | Bin 0 -> 615 bytes res/drawable-xhdpi/ic_dial_action_vm.png | Bin 0 -> 723 bytes res/drawable-xhdpi/ic_dialer_menu_dialpad_dk.png | Bin 1363 -> 0 bytes res/drawable-xhdpi/ic_dialer_menu_history_dk.png | Bin 2289 -> 0 bytes res/drawable-xhdpi/ic_menu_dialpad_dk.png | Bin 0 -> 1363 bytes res/drawable-xhdpi/ic_menu_history_dk.png | Bin 0 -> 2289 bytes res/drawable-xhdpi/ic_menu_history_lt.png | Bin 0 -> 2237 bytes res/drawable-xhdpi/ic_menu_overflow_dark.png | Bin 800 -> 0 bytes res/drawable-xhdpi/ic_menu_overflow_dk.png | Bin 0 -> 800 bytes res/drawable-xhdpi/ic_menu_overflow_lt.png | Bin 0 -> 797 bytes res/layout/dialpad_key.xml | 9 ++- res/layout/new_dialpad.xml | 70 +++++++++++++++++++---- res/layout/new_dialpad_fragment.xml | 8 +-- res/layout/new_phone_favorites_fragment.xml | 6 +- res/menu/dialpad_options_new.xml | 32 +++++++++++ res/values/colors.xml | 7 +-- res/values/dimens.xml | 5 ++ 34 files changed, 110 insertions(+), 27 deletions(-) create mode 100644 res/drawable-hdpi/ic_dial_action_vm.png delete mode 100644 res/drawable-hdpi/ic_dialer_menu_dialpad_dk.png delete mode 100644 res/drawable-hdpi/ic_dialer_menu_history_dk.png create mode 100644 res/drawable-hdpi/ic_menu_dialpad_dk.png create mode 100644 res/drawable-hdpi/ic_menu_history_dk.png create mode 100644 res/drawable-hdpi/ic_menu_history_lt.png delete mode 100644 res/drawable-hdpi/ic_menu_overflow_dark.png create mode 100644 res/drawable-hdpi/ic_menu_overflow_dk.png create mode 100644 res/drawable-hdpi/ic_menu_overflow_lt.png create mode 100644 res/drawable-mdpi/ic_dial_action_vm.png delete mode 100644 res/drawable-mdpi/ic_dialer_menu_dialpad_dk.png delete mode 100644 res/drawable-mdpi/ic_dialer_menu_history_dk.png create mode 100644 res/drawable-mdpi/ic_menu_dialpad_dk.png create mode 100644 res/drawable-mdpi/ic_menu_history_dk.png create mode 100644 res/drawable-mdpi/ic_menu_history_lt.png delete mode 100644 res/drawable-mdpi/ic_menu_overflow_dark.png create mode 100644 res/drawable-mdpi/ic_menu_overflow_dk.png create mode 100644 res/drawable-mdpi/ic_menu_overflow_lt.png create mode 100644 res/drawable-xhdpi/ic_dial_action_vm.png delete mode 100644 res/drawable-xhdpi/ic_dialer_menu_dialpad_dk.png delete mode 100644 res/drawable-xhdpi/ic_dialer_menu_history_dk.png create mode 100644 res/drawable-xhdpi/ic_menu_dialpad_dk.png create mode 100644 res/drawable-xhdpi/ic_menu_history_dk.png create mode 100644 res/drawable-xhdpi/ic_menu_history_lt.png delete mode 100644 res/drawable-xhdpi/ic_menu_overflow_dark.png create mode 100644 res/drawable-xhdpi/ic_menu_overflow_dk.png create mode 100644 res/drawable-xhdpi/ic_menu_overflow_lt.png create mode 100644 res/menu/dialpad_options_new.xml (limited to 'res') diff --git a/res/drawable-hdpi/ic_dial_action_vm.png b/res/drawable-hdpi/ic_dial_action_vm.png new file mode 100644 index 000000000..68ee3d6c9 Binary files /dev/null and b/res/drawable-hdpi/ic_dial_action_vm.png differ diff --git a/res/drawable-hdpi/ic_dialer_menu_dialpad_dk.png b/res/drawable-hdpi/ic_dialer_menu_dialpad_dk.png deleted file mode 100644 index 4da8f2855..000000000 Binary files a/res/drawable-hdpi/ic_dialer_menu_dialpad_dk.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_dialer_menu_history_dk.png b/res/drawable-hdpi/ic_dialer_menu_history_dk.png deleted file mode 100644 index b8d1944b2..000000000 Binary files a/res/drawable-hdpi/ic_dialer_menu_history_dk.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_dialpad_dk.png b/res/drawable-hdpi/ic_menu_dialpad_dk.png new file mode 100644 index 000000000..4da8f2855 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_dialpad_dk.png differ diff --git a/res/drawable-hdpi/ic_menu_history_dk.png b/res/drawable-hdpi/ic_menu_history_dk.png new file mode 100644 index 000000000..b8d1944b2 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_history_dk.png differ diff --git a/res/drawable-hdpi/ic_menu_history_lt.png b/res/drawable-hdpi/ic_menu_history_lt.png new file mode 100644 index 000000000..a36323ca9 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_history_lt.png differ diff --git a/res/drawable-hdpi/ic_menu_overflow_dark.png b/res/drawable-hdpi/ic_menu_overflow_dark.png deleted file mode 100644 index 69741cbf0..000000000 Binary files a/res/drawable-hdpi/ic_menu_overflow_dark.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_overflow_dk.png b/res/drawable-hdpi/ic_menu_overflow_dk.png new file mode 100644 index 000000000..69741cbf0 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_overflow_dk.png differ diff --git a/res/drawable-hdpi/ic_menu_overflow_lt.png b/res/drawable-hdpi/ic_menu_overflow_lt.png new file mode 100644 index 000000000..2561b8c22 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_overflow_lt.png differ diff --git a/res/drawable-mdpi/ic_dial_action_vm.png b/res/drawable-mdpi/ic_dial_action_vm.png new file mode 100644 index 000000000..5b91b42a6 Binary files /dev/null and b/res/drawable-mdpi/ic_dial_action_vm.png differ diff --git a/res/drawable-mdpi/ic_dialer_menu_dialpad_dk.png b/res/drawable-mdpi/ic_dialer_menu_dialpad_dk.png deleted file mode 100644 index 5a3ac0c33..000000000 Binary files a/res/drawable-mdpi/ic_dialer_menu_dialpad_dk.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_dialer_menu_history_dk.png b/res/drawable-mdpi/ic_dialer_menu_history_dk.png deleted file mode 100644 index d9306baf6..000000000 Binary files a/res/drawable-mdpi/ic_dialer_menu_history_dk.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_menu_dialpad_dk.png b/res/drawable-mdpi/ic_menu_dialpad_dk.png new file mode 100644 index 000000000..5a3ac0c33 Binary files /dev/null and b/res/drawable-mdpi/ic_menu_dialpad_dk.png differ diff --git a/res/drawable-mdpi/ic_menu_history_dk.png b/res/drawable-mdpi/ic_menu_history_dk.png new file mode 100644 index 000000000..d9306baf6 Binary files /dev/null and b/res/drawable-mdpi/ic_menu_history_dk.png differ diff --git a/res/drawable-mdpi/ic_menu_history_lt.png b/res/drawable-mdpi/ic_menu_history_lt.png new file mode 100644 index 000000000..3597a5e82 Binary files /dev/null and b/res/drawable-mdpi/ic_menu_history_lt.png differ diff --git a/res/drawable-mdpi/ic_menu_overflow_dark.png b/res/drawable-mdpi/ic_menu_overflow_dark.png deleted file mode 100644 index 2a477c827..000000000 Binary files a/res/drawable-mdpi/ic_menu_overflow_dark.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_menu_overflow_dk.png b/res/drawable-mdpi/ic_menu_overflow_dk.png new file mode 100644 index 000000000..2a477c827 Binary files /dev/null and b/res/drawable-mdpi/ic_menu_overflow_dk.png differ diff --git a/res/drawable-mdpi/ic_menu_overflow_lt.png b/res/drawable-mdpi/ic_menu_overflow_lt.png new file mode 100644 index 000000000..7dc68c91e Binary files /dev/null and b/res/drawable-mdpi/ic_menu_overflow_lt.png differ diff --git a/res/drawable-xhdpi/ic_dial_action_vm.png b/res/drawable-xhdpi/ic_dial_action_vm.png new file mode 100644 index 000000000..269fd1a92 Binary files /dev/null and b/res/drawable-xhdpi/ic_dial_action_vm.png differ diff --git a/res/drawable-xhdpi/ic_dialer_menu_dialpad_dk.png b/res/drawable-xhdpi/ic_dialer_menu_dialpad_dk.png deleted file mode 100644 index 317bf6611..000000000 Binary files a/res/drawable-xhdpi/ic_dialer_menu_dialpad_dk.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_dialer_menu_history_dk.png b/res/drawable-xhdpi/ic_dialer_menu_history_dk.png deleted file mode 100644 index 63ad62b39..000000000 Binary files a/res/drawable-xhdpi/ic_dialer_menu_history_dk.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_dialpad_dk.png b/res/drawable-xhdpi/ic_menu_dialpad_dk.png new file mode 100644 index 000000000..317bf6611 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_dialpad_dk.png differ diff --git a/res/drawable-xhdpi/ic_menu_history_dk.png b/res/drawable-xhdpi/ic_menu_history_dk.png new file mode 100644 index 000000000..63ad62b39 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_history_dk.png differ diff --git a/res/drawable-xhdpi/ic_menu_history_lt.png b/res/drawable-xhdpi/ic_menu_history_lt.png new file mode 100644 index 000000000..6b411cbc3 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_history_lt.png differ diff --git a/res/drawable-xhdpi/ic_menu_overflow_dark.png b/res/drawable-xhdpi/ic_menu_overflow_dark.png deleted file mode 100644 index 8cbd50827..000000000 Binary files a/res/drawable-xhdpi/ic_menu_overflow_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_overflow_dk.png b/res/drawable-xhdpi/ic_menu_overflow_dk.png new file mode 100644 index 000000000..8cbd50827 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_overflow_dk.png differ diff --git a/res/drawable-xhdpi/ic_menu_overflow_lt.png b/res/drawable-xhdpi/ic_menu_overflow_lt.png new file mode 100644 index 000000000..95e436c4b Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_overflow_lt.png differ diff --git a/res/layout/dialpad_key.xml b/res/layout/dialpad_key.xml index eef12a12f..b204c20a2 100644 --- a/res/layout/dialpad_key.xml +++ b/res/layout/dialpad_key.xml @@ -17,15 +17,14 @@ @@ -33,8 +32,8 @@ android:id="@+id/dialpad_key_letters" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="#aaaaaa" - android:textSize="11dp" + android:textColor="@color/dialpad_secondary_text_color" + android:textSize="@dimen/dialpad_key_letters_size" android:paddingRight="11dp" android:layout_alignBaseline="@id/dialpad_key_number" android:fontFamily="sans-serif-light" diff --git a/res/layout/new_dialpad.xml b/res/layout/new_dialpad.xml index e71d4edf0..60240bc3f 100644 --- a/res/layout/new_dialpad.xml +++ b/res/layout/new_dialpad.xml @@ -30,34 +30,82 @@ android:layoutDirection="ltr" > - + android:layout_height="0px" + android:layout_weight="1"> + + + + + android:layout_height="0px" + android:layout_weight="1"> + android:layout_height="0px" + android:layout_weight="1"> - + android:layout_height="0px" + android:layout_weight="1"> + + + - + + + diff --git a/res/layout/new_dialpad_fragment.xml b/res/layout/new_dialpad_fragment.xml index c357d4752..f6f652caa 100644 --- a/res/layout/new_dialpad_fragment.xml +++ b/res/layout/new_dialpad_fragment.xml @@ -85,9 +85,9 @@ android:layout_height="@dimen/fake_action_bar_height" android:layout_width="@dimen/fake_menu_button_min_width" android:layout_gravity="bottom|start" - android:background="?android:attr/selectableItemBackground" + android:background="@drawable/btn_call" android:contentDescription="@string/action_menu_call_history_description" - android:src="@drawable/ic_dialer_menu_history_dk"/> + android:src="@drawable/ic_menu_history_lt"/> diff --git a/res/layout/new_phone_favorites_fragment.xml b/res/layout/new_phone_favorites_fragment.xml index cc11ea164..2b6bbe447 100644 --- a/res/layout/new_phone_favorites_fragment.xml +++ b/res/layout/new_phone_favorites_fragment.xml @@ -58,7 +58,7 @@ android:layout_gravity="bottom|start" android:background="?android:attr/selectableItemBackground" android:contentDescription="@string/action_menu_call_history_description" - android:src="@drawable/ic_dialer_menu_history_dk"/> + android:src="@drawable/ic_menu_history_dk"/> + android:src="@drawable/ic_menu_dialpad_dk"/> diff --git a/res/menu/dialpad_options_new.xml b/res/menu/dialpad_options_new.xml new file mode 100644 index 000000000..0727dd57c --- /dev/null +++ b/res/menu/dialpad_options_new.xml @@ -0,0 +1,32 @@ + + + + + + + diff --git a/res/values/colors.xml b/res/values/colors.xml index df4b2f45d..1f337a201 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -53,10 +53,9 @@ #ee020709 - #0099cc - - #888888 + #33b5e5 + + #aaaaaa #e6e6e6 diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 452bb311c..a89f8abfd 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -49,6 +49,11 @@ 65 15 + + 40dp + 11dp + 25dp + 48dp 56dp -- cgit v1.2.3