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/drawable | |
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/drawable')
-rw-r--r-- | res/drawable/background_dial_holo_dark.xml | 22 | ||||
-rw-r--r-- | res/drawable/btn_call.xml | 32 | ||||
-rw-r--r-- | res/drawable/floating_action_button.xml (renamed from res/drawable/dialpad_background.xml) | 10 |
3 files changed, 6 insertions, 58 deletions
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> |