diff options
author | Sai Cheemalapati <saicheems@google.com> | 2014-06-18 13:53:56 -0700 |
---|---|---|
committer | Sai Cheemalapati <saicheems@google.com> | 2014-06-20 15:34:03 -0700 |
commit | 14462b65dee767d897219d685d41357c9b78c33f (patch) | |
tree | 66c4adb629e11cb43e348b1ebb46df1fab0afa86 /res | |
parent | f8a8854eeb749bee419144ab8076aa75119017be (diff) | |
download | android_packages_services_Telephony-14462b65dee767d897219d685d41357c9b78c33f.tar.gz android_packages_services_Telephony-14462b65dee767d897219d685d41357c9b78c33f.tar.bz2 android_packages_services_Telephony-14462b65dee767d897219d685d41357c9b78c33f.zip |
Update Emergency Dialer to match Dialer (6/7).
Emergency dialer style updated to match style in Dialer and
InCallUI.
Moved all dialpad resources to PhoneCommon.
Change-Id: Id68e48c63fade3138c3fd5ede9c4e55b5f5b9da1
Diffstat (limited to 'res')
111 files changed, 25 insertions, 223 deletions
diff --git a/res/drawable-ar-hdpi/dial_num_0_no_plus_wht.png b/res/drawable-ar-hdpi/dial_num_0_no_plus_wht.png Binary files differdeleted file mode 100644 index bc947b24a..000000000 --- a/res/drawable-ar-hdpi/dial_num_0_no_plus_wht.png +++ /dev/null diff --git a/res/drawable-ar-hdpi/dial_num_1_no_vm_wht.png b/res/drawable-ar-hdpi/dial_num_1_no_vm_wht.png Binary files differdeleted file mode 100644 index 2bbaeadc8..000000000 --- a/res/drawable-ar-hdpi/dial_num_1_no_vm_wht.png +++ /dev/null diff --git a/res/drawable-ar-hdpi/dial_num_2_wht.png b/res/drawable-ar-hdpi/dial_num_2_wht.png Binary files differdeleted file mode 100644 index 15583a090..000000000 --- a/res/drawable-ar-hdpi/dial_num_2_wht.png +++ /dev/null diff --git a/res/drawable-ar-hdpi/dial_num_3_wht.png b/res/drawable-ar-hdpi/dial_num_3_wht.png Binary files differdeleted file mode 100644 index c8fd5b683..000000000 --- a/res/drawable-ar-hdpi/dial_num_3_wht.png +++ /dev/null diff --git a/res/drawable-ar-hdpi/dial_num_4_wht.png b/res/drawable-ar-hdpi/dial_num_4_wht.png Binary files differdeleted file mode 100644 index 2df8330c8..000000000 --- a/res/drawable-ar-hdpi/dial_num_4_wht.png +++ /dev/null diff --git a/res/drawable-ar-hdpi/dial_num_5_wht.png b/res/drawable-ar-hdpi/dial_num_5_wht.png Binary files differdeleted file mode 100644 index b16701c57..000000000 --- a/res/drawable-ar-hdpi/dial_num_5_wht.png +++ /dev/null diff --git a/res/drawable-ar-hdpi/dial_num_6_wht.png b/res/drawable-ar-hdpi/dial_num_6_wht.png Binary files differdeleted file mode 100644 index 823fa500c..000000000 --- a/res/drawable-ar-hdpi/dial_num_6_wht.png +++ /dev/null diff --git a/res/drawable-ar-hdpi/dial_num_7_wht.png b/res/drawable-ar-hdpi/dial_num_7_wht.png Binary files differdeleted file mode 100644 index 6f5fbfffd..000000000 --- a/res/drawable-ar-hdpi/dial_num_7_wht.png +++ /dev/null diff --git a/res/drawable-ar-hdpi/dial_num_8_wht.png b/res/drawable-ar-hdpi/dial_num_8_wht.png Binary files differdeleted file mode 100644 index d15c47f27..000000000 --- a/res/drawable-ar-hdpi/dial_num_8_wht.png +++ /dev/null diff --git a/res/drawable-ar-hdpi/dial_num_9_wht.png b/res/drawable-ar-hdpi/dial_num_9_wht.png Binary files differdeleted file mode 100644 index 7b2836174..000000000 --- a/res/drawable-ar-hdpi/dial_num_9_wht.png +++ /dev/null diff --git a/res/drawable-ar-mdpi/dial_num_0_no_plus_wht.png b/res/drawable-ar-mdpi/dial_num_0_no_plus_wht.png Binary files differdeleted file mode 100644 index 2339f89de..000000000 --- a/res/drawable-ar-mdpi/dial_num_0_no_plus_wht.png +++ /dev/null diff --git a/res/drawable-ar-mdpi/dial_num_1_no_vm_wht.png b/res/drawable-ar-mdpi/dial_num_1_no_vm_wht.png Binary files differdeleted file mode 100644 index 7c80f0552..000000000 --- a/res/drawable-ar-mdpi/dial_num_1_no_vm_wht.png +++ /dev/null diff --git a/res/drawable-ar-mdpi/dial_num_2_wht.png b/res/drawable-ar-mdpi/dial_num_2_wht.png Binary files differdeleted file mode 100644 index d4421a3e3..000000000 --- a/res/drawable-ar-mdpi/dial_num_2_wht.png +++ /dev/null diff --git a/res/drawable-ar-mdpi/dial_num_3_wht.png b/res/drawable-ar-mdpi/dial_num_3_wht.png Binary files differdeleted file mode 100644 index 10e8216a4..000000000 --- a/res/drawable-ar-mdpi/dial_num_3_wht.png +++ /dev/null diff --git a/res/drawable-ar-mdpi/dial_num_4_wht.png b/res/drawable-ar-mdpi/dial_num_4_wht.png Binary files differdeleted file mode 100644 index 2c7971f4a..000000000 --- a/res/drawable-ar-mdpi/dial_num_4_wht.png +++ /dev/null diff --git a/res/drawable-ar-mdpi/dial_num_5_wht.png b/res/drawable-ar-mdpi/dial_num_5_wht.png Binary files differdeleted file mode 100644 index 472ad7a02..000000000 --- a/res/drawable-ar-mdpi/dial_num_5_wht.png +++ /dev/null diff --git a/res/drawable-ar-mdpi/dial_num_6_wht.png b/res/drawable-ar-mdpi/dial_num_6_wht.png Binary files differdeleted file mode 100644 index 682e76ae1..000000000 --- a/res/drawable-ar-mdpi/dial_num_6_wht.png +++ /dev/null diff --git a/res/drawable-ar-mdpi/dial_num_7_wht.png b/res/drawable-ar-mdpi/dial_num_7_wht.png Binary files differdeleted file mode 100644 index 9a1395f96..000000000 --- a/res/drawable-ar-mdpi/dial_num_7_wht.png +++ /dev/null diff --git a/res/drawable-ar-mdpi/dial_num_8_wht.png b/res/drawable-ar-mdpi/dial_num_8_wht.png Binary files differdeleted file mode 100644 index 6ef31ddeb..000000000 --- a/res/drawable-ar-mdpi/dial_num_8_wht.png +++ /dev/null diff --git a/res/drawable-ar-mdpi/dial_num_9_wht.png b/res/drawable-ar-mdpi/dial_num_9_wht.png Binary files differdeleted file mode 100644 index e99e20a33..000000000 --- a/res/drawable-ar-mdpi/dial_num_9_wht.png +++ /dev/null diff --git a/res/drawable-ar-xhdpi/dial_num_0_no_plus_wht.png b/res/drawable-ar-xhdpi/dial_num_0_no_plus_wht.png Binary files differdeleted file mode 100644 index 8924fc826..000000000 --- a/res/drawable-ar-xhdpi/dial_num_0_no_plus_wht.png +++ /dev/null diff --git a/res/drawable-ar-xhdpi/dial_num_1_no_vm_wht.png b/res/drawable-ar-xhdpi/dial_num_1_no_vm_wht.png Binary files differdeleted file mode 100644 index 667a7c543..000000000 --- a/res/drawable-ar-xhdpi/dial_num_1_no_vm_wht.png +++ /dev/null diff --git a/res/drawable-ar-xhdpi/dial_num_2_wht.png b/res/drawable-ar-xhdpi/dial_num_2_wht.png Binary files differdeleted file mode 100644 index 1b39dbed5..000000000 --- a/res/drawable-ar-xhdpi/dial_num_2_wht.png +++ /dev/null diff --git a/res/drawable-ar-xhdpi/dial_num_3_wht.png b/res/drawable-ar-xhdpi/dial_num_3_wht.png Binary files differdeleted file mode 100644 index 2cf7577e1..000000000 --- a/res/drawable-ar-xhdpi/dial_num_3_wht.png +++ /dev/null diff --git a/res/drawable-ar-xhdpi/dial_num_4_wht.png b/res/drawable-ar-xhdpi/dial_num_4_wht.png Binary files differdeleted file mode 100644 index 1816e6008..000000000 --- a/res/drawable-ar-xhdpi/dial_num_4_wht.png +++ /dev/null diff --git a/res/drawable-ar-xhdpi/dial_num_5_wht.png b/res/drawable-ar-xhdpi/dial_num_5_wht.png Binary files differdeleted file mode 100644 index b846a1405..000000000 --- a/res/drawable-ar-xhdpi/dial_num_5_wht.png +++ /dev/null diff --git a/res/drawable-ar-xhdpi/dial_num_6_wht.png b/res/drawable-ar-xhdpi/dial_num_6_wht.png Binary files differdeleted file mode 100644 index 5768e8705..000000000 --- a/res/drawable-ar-xhdpi/dial_num_6_wht.png +++ /dev/null diff --git a/res/drawable-ar-xhdpi/dial_num_7_wht.png b/res/drawable-ar-xhdpi/dial_num_7_wht.png Binary files differdeleted file mode 100644 index 98667a20e..000000000 --- a/res/drawable-ar-xhdpi/dial_num_7_wht.png +++ /dev/null diff --git a/res/drawable-ar-xhdpi/dial_num_8_wht.png b/res/drawable-ar-xhdpi/dial_num_8_wht.png Binary files differdeleted file mode 100644 index dc7124235..000000000 --- a/res/drawable-ar-xhdpi/dial_num_8_wht.png +++ /dev/null diff --git a/res/drawable-ar-xhdpi/dial_num_9_wht.png b/res/drawable-ar-xhdpi/dial_num_9_wht.png Binary files differdeleted file mode 100644 index 4917ee0b8..000000000 --- a/res/drawable-ar-xhdpi/dial_num_9_wht.png +++ /dev/null diff --git a/res/drawable-fa-hdpi/dial_num_0_no_plus_wht.png b/res/drawable-fa-hdpi/dial_num_0_no_plus_wht.png Binary files differdeleted file mode 100644 index bc947b24a..000000000 --- a/res/drawable-fa-hdpi/dial_num_0_no_plus_wht.png +++ /dev/null diff --git a/res/drawable-fa-hdpi/dial_num_1_no_vm_wht.png b/res/drawable-fa-hdpi/dial_num_1_no_vm_wht.png Binary files differdeleted file mode 100644 index 2bbaeadc8..000000000 --- a/res/drawable-fa-hdpi/dial_num_1_no_vm_wht.png +++ /dev/null diff --git a/res/drawable-fa-hdpi/dial_num_2_wht.png b/res/drawable-fa-hdpi/dial_num_2_wht.png Binary files differdeleted file mode 100644 index 15583a090..000000000 --- a/res/drawable-fa-hdpi/dial_num_2_wht.png +++ /dev/null diff --git a/res/drawable-fa-hdpi/dial_num_3_wht.png b/res/drawable-fa-hdpi/dial_num_3_wht.png Binary files differdeleted file mode 100644 index c8fd5b683..000000000 --- a/res/drawable-fa-hdpi/dial_num_3_wht.png +++ /dev/null diff --git a/res/drawable-fa-hdpi/dial_num_4_wht.png b/res/drawable-fa-hdpi/dial_num_4_wht.png Binary files differdeleted file mode 100644 index 4d6b4ead3..000000000 --- a/res/drawable-fa-hdpi/dial_num_4_wht.png +++ /dev/null diff --git a/res/drawable-fa-hdpi/dial_num_5_wht.png b/res/drawable-fa-hdpi/dial_num_5_wht.png Binary files differdeleted file mode 100644 index 43b2886d3..000000000 --- a/res/drawable-fa-hdpi/dial_num_5_wht.png +++ /dev/null diff --git a/res/drawable-fa-hdpi/dial_num_6_wht.png b/res/drawable-fa-hdpi/dial_num_6_wht.png Binary files differdeleted file mode 100644 index 7db627ef0..000000000 --- a/res/drawable-fa-hdpi/dial_num_6_wht.png +++ /dev/null diff --git a/res/drawable-fa-hdpi/dial_num_7_wht.png b/res/drawable-fa-hdpi/dial_num_7_wht.png Binary files differdeleted file mode 100644 index 6f5fbfffd..000000000 --- a/res/drawable-fa-hdpi/dial_num_7_wht.png +++ /dev/null diff --git a/res/drawable-fa-hdpi/dial_num_8_wht.png b/res/drawable-fa-hdpi/dial_num_8_wht.png Binary files differdeleted file mode 100644 index d15c47f27..000000000 --- a/res/drawable-fa-hdpi/dial_num_8_wht.png +++ /dev/null diff --git a/res/drawable-fa-hdpi/dial_num_9_wht.png b/res/drawable-fa-hdpi/dial_num_9_wht.png Binary files differdeleted file mode 100644 index 7b2836174..000000000 --- a/res/drawable-fa-hdpi/dial_num_9_wht.png +++ /dev/null diff --git a/res/drawable-fa-mdpi/dial_num_0_no_plus_wht.png b/res/drawable-fa-mdpi/dial_num_0_no_plus_wht.png Binary files differdeleted file mode 100644 index 2339f89de..000000000 --- a/res/drawable-fa-mdpi/dial_num_0_no_plus_wht.png +++ /dev/null diff --git a/res/drawable-fa-mdpi/dial_num_1_no_vm_wht.png b/res/drawable-fa-mdpi/dial_num_1_no_vm_wht.png Binary files differdeleted file mode 100644 index 7c80f0552..000000000 --- a/res/drawable-fa-mdpi/dial_num_1_no_vm_wht.png +++ /dev/null diff --git a/res/drawable-fa-mdpi/dial_num_2_wht.png b/res/drawable-fa-mdpi/dial_num_2_wht.png Binary files differdeleted file mode 100644 index d4421a3e3..000000000 --- a/res/drawable-fa-mdpi/dial_num_2_wht.png +++ /dev/null diff --git a/res/drawable-fa-mdpi/dial_num_3_wht.png b/res/drawable-fa-mdpi/dial_num_3_wht.png Binary files differdeleted file mode 100644 index 10e8216a4..000000000 --- a/res/drawable-fa-mdpi/dial_num_3_wht.png +++ /dev/null diff --git a/res/drawable-fa-mdpi/dial_num_4_wht.png b/res/drawable-fa-mdpi/dial_num_4_wht.png Binary files differdeleted file mode 100644 index de5c7b2cf..000000000 --- a/res/drawable-fa-mdpi/dial_num_4_wht.png +++ /dev/null diff --git a/res/drawable-fa-mdpi/dial_num_5_wht.png b/res/drawable-fa-mdpi/dial_num_5_wht.png Binary files differdeleted file mode 100644 index ba461d721..000000000 --- a/res/drawable-fa-mdpi/dial_num_5_wht.png +++ /dev/null diff --git a/res/drawable-fa-mdpi/dial_num_6_wht.png b/res/drawable-fa-mdpi/dial_num_6_wht.png Binary files differdeleted file mode 100644 index ec41f386a..000000000 --- a/res/drawable-fa-mdpi/dial_num_6_wht.png +++ /dev/null diff --git a/res/drawable-fa-mdpi/dial_num_7_wht.png b/res/drawable-fa-mdpi/dial_num_7_wht.png Binary files differdeleted file mode 100644 index 9a1395f96..000000000 --- a/res/drawable-fa-mdpi/dial_num_7_wht.png +++ /dev/null diff --git a/res/drawable-fa-mdpi/dial_num_8_wht.png b/res/drawable-fa-mdpi/dial_num_8_wht.png Binary files differdeleted file mode 100644 index 6ef31ddeb..000000000 --- a/res/drawable-fa-mdpi/dial_num_8_wht.png +++ /dev/null diff --git a/res/drawable-fa-mdpi/dial_num_9_wht.png b/res/drawable-fa-mdpi/dial_num_9_wht.png Binary files differdeleted file mode 100644 index e99e20a33..000000000 --- a/res/drawable-fa-mdpi/dial_num_9_wht.png +++ /dev/null diff --git a/res/drawable-fa-xhdpi/dial_num_0_no_plus_wht.png b/res/drawable-fa-xhdpi/dial_num_0_no_plus_wht.png Binary files differdeleted file mode 100644 index 8924fc826..000000000 --- a/res/drawable-fa-xhdpi/dial_num_0_no_plus_wht.png +++ /dev/null diff --git a/res/drawable-fa-xhdpi/dial_num_1_no_vm_wht.png b/res/drawable-fa-xhdpi/dial_num_1_no_vm_wht.png Binary files differdeleted file mode 100644 index 667a7c543..000000000 --- a/res/drawable-fa-xhdpi/dial_num_1_no_vm_wht.png +++ /dev/null diff --git a/res/drawable-fa-xhdpi/dial_num_2_wht.png b/res/drawable-fa-xhdpi/dial_num_2_wht.png Binary files differdeleted file mode 100644 index 1b39dbed5..000000000 --- a/res/drawable-fa-xhdpi/dial_num_2_wht.png +++ /dev/null diff --git a/res/drawable-fa-xhdpi/dial_num_3_wht.png b/res/drawable-fa-xhdpi/dial_num_3_wht.png Binary files differdeleted file mode 100644 index 2cf7577e1..000000000 --- a/res/drawable-fa-xhdpi/dial_num_3_wht.png +++ /dev/null diff --git a/res/drawable-fa-xhdpi/dial_num_4_wht.png b/res/drawable-fa-xhdpi/dial_num_4_wht.png Binary files differdeleted file mode 100644 index 6e0a5a966..000000000 --- a/res/drawable-fa-xhdpi/dial_num_4_wht.png +++ /dev/null diff --git a/res/drawable-fa-xhdpi/dial_num_5_wht.png b/res/drawable-fa-xhdpi/dial_num_5_wht.png Binary files differdeleted file mode 100644 index f49690660..000000000 --- a/res/drawable-fa-xhdpi/dial_num_5_wht.png +++ /dev/null diff --git a/res/drawable-fa-xhdpi/dial_num_6_wht.png b/res/drawable-fa-xhdpi/dial_num_6_wht.png Binary files differdeleted file mode 100644 index e75b83eab..000000000 --- a/res/drawable-fa-xhdpi/dial_num_6_wht.png +++ /dev/null diff --git a/res/drawable-fa-xhdpi/dial_num_7_wht.png b/res/drawable-fa-xhdpi/dial_num_7_wht.png Binary files differdeleted file mode 100644 index 98667a20e..000000000 --- a/res/drawable-fa-xhdpi/dial_num_7_wht.png +++ /dev/null diff --git a/res/drawable-fa-xhdpi/dial_num_8_wht.png b/res/drawable-fa-xhdpi/dial_num_8_wht.png Binary files differdeleted file mode 100644 index dc7124235..000000000 --- a/res/drawable-fa-xhdpi/dial_num_8_wht.png +++ /dev/null diff --git a/res/drawable-fa-xhdpi/dial_num_9_wht.png b/res/drawable-fa-xhdpi/dial_num_9_wht.png Binary files differdeleted file mode 100644 index 4917ee0b8..000000000 --- a/res/drawable-fa-xhdpi/dial_num_9_wht.png +++ /dev/null diff --git a/res/drawable-hdpi/btn_call_pressed.png b/res/drawable-hdpi/btn_call_pressed.png Binary files differdeleted file mode 100644 index d6e47f433..000000000 --- a/res/drawable-hdpi/btn_call_pressed.png +++ /dev/null diff --git a/res/drawable-hdpi/dial_background_texture.png b/res/drawable-hdpi/dial_background_texture.png Binary files differdeleted file mode 100644 index 9df3b1e75..000000000 --- a/res/drawable-hdpi/dial_background_texture.png +++ /dev/null diff --git a/res/drawable-hdpi/dial_num_0_no_plus_wht.png b/res/drawable-hdpi/dial_num_0_no_plus_wht.png Binary files differdeleted file mode 100644 index 69849eca3..000000000 --- a/res/drawable-hdpi/dial_num_0_no_plus_wht.png +++ /dev/null diff --git a/res/drawable-hdpi/dial_num_1_no_vm_wht.png b/res/drawable-hdpi/dial_num_1_no_vm_wht.png Binary files differdeleted file mode 100644 index af7ec4296..000000000 --- a/res/drawable-hdpi/dial_num_1_no_vm_wht.png +++ /dev/null diff --git a/res/drawable-hdpi/dial_num_2_wht.png b/res/drawable-hdpi/dial_num_2_wht.png Binary files differdeleted file mode 100644 index 2ae20ab39..000000000 --- a/res/drawable-hdpi/dial_num_2_wht.png +++ /dev/null diff --git a/res/drawable-hdpi/dial_num_3_wht.png b/res/drawable-hdpi/dial_num_3_wht.png Binary files differdeleted file mode 100644 index 991d5f3dc..000000000 --- a/res/drawable-hdpi/dial_num_3_wht.png +++ /dev/null diff --git a/res/drawable-hdpi/dial_num_4_wht.png b/res/drawable-hdpi/dial_num_4_wht.png Binary files differdeleted file mode 100644 index 7aad3ef97..000000000 --- a/res/drawable-hdpi/dial_num_4_wht.png +++ /dev/null diff --git a/res/drawable-hdpi/dial_num_5_wht.png b/res/drawable-hdpi/dial_num_5_wht.png Binary files differdeleted file mode 100644 index 42a1d0bb5..000000000 --- a/res/drawable-hdpi/dial_num_5_wht.png +++ /dev/null diff --git a/res/drawable-hdpi/dial_num_6_wht.png b/res/drawable-hdpi/dial_num_6_wht.png Binary files differdeleted file mode 100644 index b03e0191a..000000000 --- a/res/drawable-hdpi/dial_num_6_wht.png +++ /dev/null diff --git a/res/drawable-hdpi/dial_num_7_wht.png b/res/drawable-hdpi/dial_num_7_wht.png Binary files differdeleted file mode 100644 index 8b72fffd6..000000000 --- a/res/drawable-hdpi/dial_num_7_wht.png +++ /dev/null diff --git a/res/drawable-hdpi/dial_num_8_wht.png b/res/drawable-hdpi/dial_num_8_wht.png Binary files differdeleted file mode 100644 index 822f21a94..000000000 --- a/res/drawable-hdpi/dial_num_8_wht.png +++ /dev/null diff --git a/res/drawable-hdpi/dial_num_9_wht.png b/res/drawable-hdpi/dial_num_9_wht.png Binary files differdeleted file mode 100644 index 2ee944b5d..000000000 --- a/res/drawable-hdpi/dial_num_9_wht.png +++ /dev/null diff --git a/res/drawable-hdpi/fab_ic_call.png b/res/drawable-hdpi/fab_ic_call.png Binary files differnew file mode 100644 index 000000000..7bf83fa6a --- /dev/null +++ b/res/drawable-hdpi/fab_ic_call.png diff --git a/res/drawable-hdpi/fab_teal_background.png b/res/drawable-hdpi/fab_teal_background.png Binary files differnew file mode 100644 index 000000000..e2f01e87a --- /dev/null +++ b/res/drawable-hdpi/fab_teal_background.png diff --git a/res/drawable-mdpi/btn_call_pressed.png b/res/drawable-mdpi/btn_call_pressed.png Binary files differdeleted file mode 100644 index 9d38da527..000000000 --- a/res/drawable-mdpi/btn_call_pressed.png +++ /dev/null diff --git a/res/drawable-mdpi/dial_background_texture.png b/res/drawable-mdpi/dial_background_texture.png Binary files differdeleted file mode 100644 index 90cd07c02..000000000 --- a/res/drawable-mdpi/dial_background_texture.png +++ /dev/null diff --git a/res/drawable-mdpi/dial_num_0_no_plus_wht.png b/res/drawable-mdpi/dial_num_0_no_plus_wht.png Binary files differdeleted file mode 100644 index 1d8b0e3e2..000000000 --- a/res/drawable-mdpi/dial_num_0_no_plus_wht.png +++ /dev/null diff --git a/res/drawable-mdpi/dial_num_1_no_vm_wht.png b/res/drawable-mdpi/dial_num_1_no_vm_wht.png Binary files differdeleted file mode 100644 index e253724d6..000000000 --- a/res/drawable-mdpi/dial_num_1_no_vm_wht.png +++ /dev/null diff --git a/res/drawable-mdpi/dial_num_2_wht.png b/res/drawable-mdpi/dial_num_2_wht.png Binary files differdeleted file mode 100644 index e311f4f64..000000000 --- a/res/drawable-mdpi/dial_num_2_wht.png +++ /dev/null diff --git a/res/drawable-mdpi/dial_num_3_wht.png b/res/drawable-mdpi/dial_num_3_wht.png Binary files differdeleted file mode 100644 index f07324a38..000000000 --- a/res/drawable-mdpi/dial_num_3_wht.png +++ /dev/null diff --git a/res/drawable-mdpi/dial_num_4_wht.png b/res/drawable-mdpi/dial_num_4_wht.png Binary files differdeleted file mode 100644 index cd8d33c89..000000000 --- a/res/drawable-mdpi/dial_num_4_wht.png +++ /dev/null diff --git a/res/drawable-mdpi/dial_num_5_wht.png b/res/drawable-mdpi/dial_num_5_wht.png Binary files differdeleted file mode 100644 index a9f27dc3a..000000000 --- a/res/drawable-mdpi/dial_num_5_wht.png +++ /dev/null diff --git a/res/drawable-mdpi/dial_num_6_wht.png b/res/drawable-mdpi/dial_num_6_wht.png Binary files differdeleted file mode 100644 index 2bdf08e51..000000000 --- a/res/drawable-mdpi/dial_num_6_wht.png +++ /dev/null diff --git a/res/drawable-mdpi/dial_num_7_wht.png b/res/drawable-mdpi/dial_num_7_wht.png Binary files differdeleted file mode 100644 index 6c1c599a5..000000000 --- a/res/drawable-mdpi/dial_num_7_wht.png +++ /dev/null diff --git a/res/drawable-mdpi/dial_num_8_wht.png b/res/drawable-mdpi/dial_num_8_wht.png Binary files differdeleted file mode 100644 index db0694ce1..000000000 --- a/res/drawable-mdpi/dial_num_8_wht.png +++ /dev/null diff --git a/res/drawable-mdpi/dial_num_9_wht.png b/res/drawable-mdpi/dial_num_9_wht.png Binary files differdeleted file mode 100644 index 692fdb06e..000000000 --- a/res/drawable-mdpi/dial_num_9_wht.png +++ /dev/null diff --git a/res/drawable-mdpi/fab_ic_call.png b/res/drawable-mdpi/fab_ic_call.png Binary files differnew file mode 100644 index 000000000..790f93590 --- /dev/null +++ b/res/drawable-mdpi/fab_ic_call.png diff --git a/res/drawable-mdpi/fab_teal_background.png b/res/drawable-mdpi/fab_teal_background.png Binary files differnew file mode 100644 index 000000000..c95d1240e --- /dev/null +++ b/res/drawable-mdpi/fab_teal_background.png diff --git a/res/drawable-xhdpi/btn_call_pressed.png b/res/drawable-xhdpi/btn_call_pressed.png Binary files differdeleted file mode 100644 index 48e7eba54..000000000 --- a/res/drawable-xhdpi/btn_call_pressed.png +++ /dev/null diff --git a/res/drawable-xhdpi/dial_background_texture.png b/res/drawable-xhdpi/dial_background_texture.png Binary files differdeleted file mode 100644 index 02aacc87d..000000000 --- a/res/drawable-xhdpi/dial_background_texture.png +++ /dev/null diff --git a/res/drawable-xhdpi/dial_num_0_no_plus_wht.png b/res/drawable-xhdpi/dial_num_0_no_plus_wht.png Binary files differdeleted file mode 100644 index 11ca993c1..000000000 --- a/res/drawable-xhdpi/dial_num_0_no_plus_wht.png +++ /dev/null diff --git a/res/drawable-xhdpi/dial_num_1_no_vm_wht.png b/res/drawable-xhdpi/dial_num_1_no_vm_wht.png Binary files differdeleted file mode 100644 index 8d2ac70ae..000000000 --- a/res/drawable-xhdpi/dial_num_1_no_vm_wht.png +++ /dev/null diff --git a/res/drawable-xhdpi/dial_num_2_wht.png b/res/drawable-xhdpi/dial_num_2_wht.png Binary files differdeleted file mode 100644 index 12c4ab9ba..000000000 --- a/res/drawable-xhdpi/dial_num_2_wht.png +++ /dev/null diff --git a/res/drawable-xhdpi/dial_num_3_wht.png b/res/drawable-xhdpi/dial_num_3_wht.png Binary files differdeleted file mode 100644 index 4353e8a39..000000000 --- a/res/drawable-xhdpi/dial_num_3_wht.png +++ /dev/null diff --git a/res/drawable-xhdpi/dial_num_4_wht.png b/res/drawable-xhdpi/dial_num_4_wht.png Binary files differdeleted file mode 100644 index ccee5cce7..000000000 --- a/res/drawable-xhdpi/dial_num_4_wht.png +++ /dev/null diff --git a/res/drawable-xhdpi/dial_num_5_wht.png b/res/drawable-xhdpi/dial_num_5_wht.png Binary files differdeleted file mode 100644 index f27f153cd..000000000 --- a/res/drawable-xhdpi/dial_num_5_wht.png +++ /dev/null diff --git a/res/drawable-xhdpi/dial_num_6_wht.png b/res/drawable-xhdpi/dial_num_6_wht.png Binary files differdeleted file mode 100644 index 8966d13d3..000000000 --- a/res/drawable-xhdpi/dial_num_6_wht.png +++ /dev/null diff --git a/res/drawable-xhdpi/dial_num_7_wht.png b/res/drawable-xhdpi/dial_num_7_wht.png Binary files differdeleted file mode 100644 index b01881058..000000000 --- a/res/drawable-xhdpi/dial_num_7_wht.png +++ /dev/null diff --git a/res/drawable-xhdpi/dial_num_8_wht.png b/res/drawable-xhdpi/dial_num_8_wht.png Binary files differdeleted file mode 100644 index 7c7b4f8db..000000000 --- a/res/drawable-xhdpi/dial_num_8_wht.png +++ /dev/null diff --git a/res/drawable-xhdpi/dial_num_9_wht.png b/res/drawable-xhdpi/dial_num_9_wht.png Binary files differdeleted file mode 100644 index 23984f03d..000000000 --- a/res/drawable-xhdpi/dial_num_9_wht.png +++ /dev/null diff --git a/res/drawable-xhdpi/fab_ic_call.png b/res/drawable-xhdpi/fab_ic_call.png Binary files differnew file mode 100644 index 000000000..6bd53f5c5 --- /dev/null +++ b/res/drawable-xhdpi/fab_ic_call.png diff --git a/res/drawable-xhdpi/fab_teal_background.png b/res/drawable-xhdpi/fab_teal_background.png Binary files differnew file mode 100644 index 000000000..f94f75935 --- /dev/null +++ b/res/drawable-xhdpi/fab_teal_background.png diff --git a/res/drawable-xxhdpi/fab_ic_call.png b/res/drawable-xxhdpi/fab_ic_call.png Binary files differnew file mode 100644 index 000000000..6866fa430 --- /dev/null +++ b/res/drawable-xxhdpi/fab_ic_call.png diff --git a/res/drawable-xxhdpi/fab_teal_background.png b/res/drawable-xxhdpi/fab_teal_background.png Binary files differnew file mode 100644 index 000000000..cc0ba27b6 --- /dev/null +++ b/res/drawable-xxhdpi/fab_teal_background.png diff --git a/res/drawable/background_dial_holo_dark.xml b/res/drawable/background_dial_holo_dark.xml deleted file mode 100644 index e06507f27..000000000 --- a/res/drawable/background_dial_holo_dark.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 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. ---> - -<shape xmlns:android="http://schemas.android.com/apk/res/android"> - <gradient - android:startColor="#ff020709" - android:endColor="#ff0a242d" - android:angle="270" /> -</shape> diff --git a/res/drawable/btn_call.xml b/res/drawable/btn_call.xml deleted file mode 100644 index abce98313..000000000 --- a/res/drawable/btn_call.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<!-- Background resource for call button in the various dialpads. - Almost a copy from framework's item_background_holo_dark.xml, but has different pressed effect - --> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - - <item android:state_window_focused="false" android:drawable="@android:color/transparent" /> - - <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. --> - <item android:state_focused="true" android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/list_selector_disabled_holo_dark" /> - <item android:state_focused="true" android:state_enabled="false" android:drawable="@drawable/list_selector_disabled_holo_dark" /> - <item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/btn_call_pressed" /> - <item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/btn_call_pressed" /> - <item android:state_focused="true" android:drawable="@drawable/list_focused_holo" /> - <item android:drawable="@android:color/transparent" /> -</selector> - diff --git a/res/drawable/dialpad_background.xml b/res/drawable/floating_action_button.xml index 0e31f5eac..d518dddd4 100644 --- a/res/drawable/dialpad_background.xml +++ b/res/drawable/floating_action_button.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project +<!-- + 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. @@ -14,6 +15,7 @@ limitations under the License. --> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/dial_background_texture" - android:tileMode="repeat" /> +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="@color/dialer_accent_color"> + <item android:drawable="@drawable/fab_teal_background" /> +</ripple> diff --git a/res/layout/dialpad.xml b/res/layout/dialpad.xml deleted file mode 100644 index 45ce51353..000000000 --- a/res/layout/dialpad.xml +++ /dev/null @@ -1,88 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2006 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. ---> - -<!-- The grid of buttons used in the onscreen DTMF dialpad; - see dtmf_twelve_key_dialer_view.xml. --> -<TableLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/dialpad" - android:layout_width="match_parent" - android:layout_height="0px" - android:layout_weight="@integer/dialpad_layout_weight_dialpad" - android:layout_gravity="center_horizontal" - android:layout_marginTop="@dimen/dialpad_vertical_margin" - android:paddingStart="5dip" - android:paddingEnd="5dip" - android:paddingBottom="10dip" - android:background="@drawable/dialpad_background" - android:layoutDirection="ltr"> - - <TableRow - android:layout_height="0px" - android:layout_weight="1"> - <ImageButton android:id="@+id/one" style="@style/DialpadButtonStyle" - android:src="@drawable/dial_num_1_no_vm_wht" - android:contentDescription="@string/description_image_button_one" /> - <ImageButton android:id="@+id/two" style="@style/DialpadButtonStyle" - android:src="@drawable/dial_num_2_wht" - android:contentDescription="@string/description_image_button_two" /> - <ImageButton android:id="@+id/three" style="@style/DialpadButtonStyle" - android:src="@drawable/dial_num_3_wht" - android:contentDescription="@string/description_image_button_three" /> - </TableRow> - - <TableRow - android:layout_height="0px" - android:layout_weight="1"> - <ImageButton android:id="@+id/four" style="@style/DialpadButtonStyle" - android:src="@drawable/dial_num_4_wht" - android:contentDescription="@string/description_image_button_four" /> - <ImageButton android:id="@+id/five" style="@style/DialpadButtonStyle" - android:src="@drawable/dial_num_5_wht" - android:contentDescription="@string/description_image_button_five" /> - <ImageButton android:id="@+id/six" style="@style/DialpadButtonStyle" - android:src="@drawable/dial_num_6_wht" - android:contentDescription="@string/description_image_button_six" /> - </TableRow> - - <TableRow - android:layout_height="0px" - android:layout_weight="1"> - <ImageButton android:id="@+id/seven" style="@style/DialpadButtonStyle" - android:src="@drawable/dial_num_7_wht" - android:contentDescription="@string/description_image_button_seven" /> - <ImageButton android:id="@+id/eight" style="@style/DialpadButtonStyle" - android:src="@drawable/dial_num_8_wht" - android:contentDescription="@string/description_image_button_eight" /> - <ImageButton android:id="@+id/nine" style="@style/DialpadButtonStyle" - android:src="@drawable/dial_num_9_wht" - android:contentDescription="@string/description_image_button_nine" /> - </TableRow> - - <TableRow - android:layout_height="0px" - android:layout_weight="1"> - <ImageButton android:id="@+id/star" style="@style/DialpadButtonStyle" - android:src="@drawable/dial_num_star_wht" - android:contentDescription="@string/description_image_button_star" /> - <ImageButton android:id="@+id/zero" style="@style/DialpadButtonStyle" - android:src="@drawable/dial_num_0_no_plus_wht" - android:contentDescription="@string/description_image_button_zero" /> - <ImageButton android:id="@+id/pound" style="@style/DialpadButtonStyle" - android:src="@drawable/dial_num_pound_wht" - android:contentDescription="@string/description_image_button_pound" /> - </TableRow> -</TableLayout> diff --git a/res/layout/emergency_dialer.xml b/res/layout/emergency_dialer.xml index d98631ee8..5c721c518 100644 --- a/res/layout/emergency_dialer.xml +++ b/res/layout/emergency_dialer.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2006 The Android Open Source Project +<!-- 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. @@ -15,76 +15,24 @@ --> <!-- Layout for the emergency dialer; see EmergencyDialer.java. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/top" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:layout_marginStart="@dimen/dialpad_horizontal_margin" - android:layout_marginEnd="@dimen/dialpad_horizontal_margin"> - - <!-- Text field above the keypad where the digits are displayed --> - <LinearLayout - android:id="@+id/digits_container" - android:layout_width="match_parent" - android:layout_height="0px" - android:layout_weight="@integer/dialpad_layout_weight_digits" - android:layout_marginTop="@dimen/dialpad_vertical_margin" - android:gravity="center" - android:background="@drawable/dialpad_background" > - - <EditText - android:id="@+id/digits" - android:layout_width="0dip" - android:layout_weight="1" - android:layout_height="match_parent" - android:gravity="center" - android:scrollHorizontally="true" - android:textAppearance="@style/DialtactsDigitsTextAppearance" - android:focusableInTouchMode="false" - android:nextFocusRight="@+id/deleteButton" - android:background="@android:color/transparent" /> - - <ImageButton - android:id="@+id/deleteButton" - android:layout_width="56dip" - android:layout_height="match_parent" - android:layout_gravity="center_vertical" - android:gravity="center" - android:state_enabled="false" - android:background="?android:attr/selectableItemBackground" - android:contentDescription="@string/description_delete_button" - android:src="@drawable/ic_dial_action_delete" /> - </LinearLayout> - - <!-- Keypad section --> - <include layout="@layout/dialpad" /> - - <View - android:layout_width="match_parent" - android:layout_height="@dimen/dialpad_vertical_margin" - android:background="#66000000"/> - - <!-- In usual dialpad we set some padding between this button and the - left/right edges. Here, we don't do that just for simplicitly. --> + android:layout_height="match_parent" > + <include layout="@layout/dialpad_view" /> <FrameLayout - android:id="@+id/dialButtonContainer" - android:layout_width="match_parent" - android:layout_height="0px" - android:layout_weight="@integer/dialpad_layout_weight_additional_buttons" - android:layout_gravity="center_horizontal" - android:background="@drawable/dialpad_background"> + android:id="@+id/floating_action_button_container" + android:layout_width="@dimen/floating_action_button_width" + android:layout_height="@dimen/floating_action_button_height" + android:layout_marginBottom="@dimen/floating_action_button_margin_bottom" + android:layout_gravity="center_horizontal|bottom" > <ImageButton - android:id="@+id/dialButton" + android:id="@+id/floating_action_button" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_gravity="center" - android:state_enabled="false" - android:background="@drawable/btn_call" + android:background="@drawable/floating_action_button" android:contentDescription="@string/description_dial_button" - android:src="@drawable/ic_dial_action_call" /> - + android:src="@drawable/fab_ic_call"/> </FrameLayout> - -</LinearLayout> +</FrameLayout> diff --git a/res/values/colors.xml b/res/values/colors.xml index 5eab9e3a6..c493a1142 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -50,4 +50,6 @@ <color name="setting_primary_color">#4d4c4c</color> <!-- Color for the setting description text. --> <color name="setting_secondary_color">#989898</color> + <color name="dialer_dialpad_touch_tint">#331dc7db</color> + <color name="dialer_accent_color">#eeff41</color> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index b62026b31..689ec84d4 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -220,14 +220,6 @@ <item name="*android:windowAnimationStyle">@style/InCallAnimationStyle</item> </style> - <style name="DialpadButtonStyle"> - <item name="android:layout_width">0dip</item> - <item name="android:layout_height">match_parent</item> - <item name="android:layout_weight">1</item> - <item name="android:background">?android:attr/selectableItemBackground</item> - <item name="android:soundEffectsEnabled">false</item> - </style> - <style name="ContactsActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse"> <item name="android:background">@color/people_app_theme_color</item> @@ -255,15 +247,15 @@ <item name="android:src">@drawable/ic_menu_overflow_lt</item> </style> + <style name="EmergencyDialerTheme" parent="@android:style/Theme.Material.Light"> + <item name="dialpad_key_button_touch_tint">@color/dialer_dialpad_touch_tint</item> + </style> + <style name="SimImportTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar"> <item name="android:actionBarStyle">@style/ContactsActionBarStyle</item> </style> - <style name="EmergencyDialerTheme" parent="@android:style/Theme.Holo"> - <item name="android:windowBackground">@android:color/black</item> - </style> - <style name="OutgoingCallBroadcasterTheme" parent="@android:style/Theme.Holo.NoActionBar"> <item name="android:windowBackground">@android:color/black</item> |