diff options
author | Yorke Lee <yorkelee@google.com> | 2014-04-25 14:39:22 -0700 |
---|---|---|
committer | Yorke Lee <yorkelee@google.com> | 2014-04-25 14:41:47 -0700 |
commit | dba3da41d49c8787a0ed7961fef2ab0bd4ac1770 (patch) | |
tree | 9c01010104cab4a3aad2a45d1ec8488e8bfcd9fb | |
parent | 43f80fa2bfa81f60d33c9cf855e7b7c8c0097946 (diff) |
Use ShapeDrawable for floating end call button in InCallUI
Change-Id: I30a8b475b09dea8de3fae7d163acdcb13718e9b4
5 files changed, 109 insertions, 1 deletions
diff --git a/InCallUI/res/drawable/floating_end_button_active_background.xml b/InCallUI/res/drawable/floating_end_button_active_background.xml new file mode 100644 index 000000000..935c93721 --- /dev/null +++ b/InCallUI/res/drawable/floating_end_button_active_background.xml @@ -0,0 +1,28 @@ +<?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 new file mode 100644 index 000000000..2f2ad7921 --- /dev/null +++ b/InCallUI/res/drawable/floating_end_button_compound_background.xml @@ -0,0 +1,24 @@ +<?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/floating_end_button_active_background" /> +</selector> diff --git a/InCallUI/res/drawable/floating_end_button_disabled_background.xml b/InCallUI/res/drawable/floating_end_button_disabled_background.xml new file mode 100644 index 000000000..3772b00b0 --- /dev/null +++ b/InCallUI/res/drawable/floating_end_button_disabled_background.xml @@ -0,0 +1,28 @@ +<?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 new file mode 100644 index 000000000..cd58a84e7 --- /dev/null +++ b/InCallUI/res/drawable/floating_end_button_pressed_background.xml @@ -0,0 +1,28 @@ +<?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 diff --git a/InCallUI/res/layout/call_card.xml b/InCallUI/res/layout/call_card.xml index 87523106e..69c9710aa 100644 --- a/InCallUI/res/layout/call_card.xml +++ b/InCallUI/res/layout/call_card.xml @@ -87,7 +87,7 @@ <ImageButton android:id="@+id/endButton" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/end_call_background" + android:background="@drawable/floating_end_button_compound_background" android:src="@drawable/ic_in_call_phone_hangup" android:contentDescription="@string/onscreenEndCallText" /> |