From dba3da41d49c8787a0ed7961fef2ab0bd4ac1770 Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Fri, 25 Apr 2014 14:39:22 -0700
Subject: Use ShapeDrawable for floating end call button in InCallUI

Change-Id: I30a8b475b09dea8de3fae7d163acdcb13718e9b4
---
 .../floating_end_button_active_background.xml      | 28 ++++++++++++++++++++++
 .../floating_end_button_compound_background.xml    | 24 +++++++++++++++++++
 .../floating_end_button_disabled_background.xml    | 28 ++++++++++++++++++++++
 .../floating_end_button_pressed_background.xml     | 28 ++++++++++++++++++++++
 InCallUI/res/layout/call_card.xml                  |  2 +-
 5 files changed, 109 insertions(+), 1 deletion(-)
 create mode 100644 InCallUI/res/drawable/floating_end_button_active_background.xml
 create mode 100644 InCallUI/res/drawable/floating_end_button_compound_background.xml
 create mode 100644 InCallUI/res/drawable/floating_end_button_disabled_background.xml
 create mode 100644 InCallUI/res/drawable/floating_end_button_pressed_background.xml

(limited to 'InCallUI')

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" />
 
-- 
cgit v1.2.3