diff options
author | Andrew Lee <anwlee@google.com> | 2014-05-09 18:07:20 -0700 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2014-05-09 18:07:20 -0700 |
commit | c8caa6b8ca6fbfe58f5f61160f7b08b1f00be025 (patch) | |
tree | de89b5fcc2950ca9fad2fbc19dcdcb84f25ab4ac /InCallUI/res/drawable | |
parent | 6cfe4b88f21142eb6145368e5f51a25904262b3b (diff) | |
parent | bc36839e4178147bfb9dba29955cb26d57bdf0fa (diff) |
resolved conflicts for merge of 41ffd656 to master-nova
Change-Id: Ie8f34527c54b99e4e6530ff9ccf2bfb24f222487
Diffstat (limited to 'InCallUI/res/drawable')
5 files changed, 5 insertions, 113 deletions
diff --git a/InCallUI/res/drawable/end_call_background.xml b/InCallUI/res/drawable/end_call_background.xml index 24b437482..4477d9e30 100644 --- a/InCallUI/res/drawable/end_call_background.xml +++ b/InCallUI/res/drawable/end_call_background.xml @@ -15,8 +15,8 @@ --> <!-- Background drawable used to render the "end call" button. --> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="false" android:drawable="@color/end_call_disabled_color" /> - <item android:state_pressed="true" android:drawable="@color/end_call_pressed_color" /> - <item android:drawable="@color/end_call_active_color" /> -</selector> +<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android" + android:tint="@color/end_call_touch_feedback_tint" + android:pinned="true"> + <item android:drawable="@drawable/fab_red_background" /> +</touch-feedback> diff --git a/InCallUI/res/drawable/floating_end_button_active_background.xml b/InCallUI/res/drawable/floating_end_button_active_background.xml deleted file mode 100644 index 935c93721..000000000 --- a/InCallUI/res/drawable/floating_end_button_active_background.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - 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. - 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" - android:shape="oval" > - <corners - android:radius="@dimen/floating_action_button_radius" /> - <size - android:width="@dimen/floating_action_button_width" - android:height="@dimen/floating_action_button_height" /> - <solid - android:color="@color/end_call_active_color" /> -</shape>
\ No newline at end of file diff --git a/InCallUI/res/drawable/floating_end_button_compound_background.xml b/InCallUI/res/drawable/floating_end_button_compound_background.xml deleted file mode 100644 index 433545b84..000000000 --- a/InCallUI/res/drawable/floating_end_button_compound_background.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- 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. - 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 drawable used to render the floating circular "end call" button. --> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="false" - android:drawable="@drawable/floating_end_button_disabled_background" /> - <item android:state_pressed="true" - android:drawable="@drawable/floating_end_button_pressed_background" /> - <item android:drawable="@drawable/fab_red_background" /> -</selector> diff --git a/InCallUI/res/drawable/floating_end_button_disabled_background.xml b/InCallUI/res/drawable/floating_end_button_disabled_background.xml deleted file mode 100644 index 3772b00b0..000000000 --- a/InCallUI/res/drawable/floating_end_button_disabled_background.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - 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. - 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" - android:shape="oval" > - <corners - android:radius="@dimen/floating_action_button_radius" /> - <size - android:width="@dimen/floating_action_button_width" - android:height="@dimen/floating_action_button_height" /> - <solid - android:color="@color/end_call_disabled_color" /> -</shape>
\ No newline at end of file diff --git a/InCallUI/res/drawable/floating_end_button_pressed_background.xml b/InCallUI/res/drawable/floating_end_button_pressed_background.xml deleted file mode 100644 index cd58a84e7..000000000 --- a/InCallUI/res/drawable/floating_end_button_pressed_background.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - 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. - 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" - android:shape="oval" > - <corners - android:radius="@dimen/floating_action_button_radius" /> - <size - android:width="@dimen/floating_action_button_width" - android:height="@dimen/floating_action_button_height" /> - <solid - android:color="@color/end_call_pressed_color" /> -</shape>
\ No newline at end of file |