diff options
author | Andrew Lee <anwlee@google.com> | 2014-07-11 15:50:00 -0700 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2014-07-15 10:54:02 -0700 |
commit | c0be1faf6fa10b7b4ab025012cdffd98a5be7148 (patch) | |
tree | 47926d4f151c6cd9a35a7533846623bcbc9dde61 /InCallUI/res/drawable | |
parent | a39948564946dabae36a7201eb5c28d8941b96c3 (diff) |
Show different glowpad options for incoming video call.
- Refactor code be more flexibile/specific in specifying the targets
for the glow pad; went from "n-way" labeling of different target sets
to more explicit labeling of scenarios, such as "audio without sms".
- Add target sets and cases for showing targest in AnswerFragment.
- Added new drawable for the target to answer a video call.
- Add method to GlowPadView to allow changing the handle (now it may
be either a videocamera or phone icon, depending on the scenario).
- Add a new video handle for incoming video calls.
- TODO: Hook this up to show these glowpads if there is an incoming
video call.
- Deleted some unused resource files.
Bug: 16015750
Change-Id: I77ff08f45f57cd2817866b5d78648af8891bb675
Diffstat (limited to 'InCallUI/res/drawable')
-rw-r--r-- | InCallUI/res/drawable/ic_incall_audio_handle.xml (renamed from InCallUI/res/drawable/ic_in_call_touch_handle.xml) | 2 | ||||
-rw-r--r-- | InCallUI/res/drawable/ic_incall_video_handle.xml | 41 | ||||
-rw-r--r-- | InCallUI/res/drawable/ic_lockscreen_answer_video.xml | 28 | ||||
-rw-r--r-- | InCallUI/res/drawable/ic_lockscreen_answer_video_activated_layer.xml | 25 | ||||
-rw-r--r-- | InCallUI/res/drawable/ic_lockscreen_answer_video_normal_layer.xml | 33 |
5 files changed, 128 insertions, 1 deletions
diff --git a/InCallUI/res/drawable/ic_in_call_touch_handle.xml b/InCallUI/res/drawable/ic_incall_audio_handle.xml index 47d902bb7..fd40e517c 100644 --- a/InCallUI/res/drawable/ic_in_call_touch_handle.xml +++ b/InCallUI/res/drawable/ic_incall_audio_handle.xml @@ -17,7 +17,7 @@ <!-- Touch handle for the GlowPadView widget on the incoming call screen --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <!-- Call icon on tinted floating action bar background. --> + <!-- Audio call icon on tinted floating action bar background. --> <item android:state_enabled="true" android:state_active="false" diff --git a/InCallUI/res/drawable/ic_incall_video_handle.xml b/InCallUI/res/drawable/ic_incall_video_handle.xml new file mode 100644 index 000000000..80636afec --- /dev/null +++ b/InCallUI/res/drawable/ic_incall_video_handle.xml @@ -0,0 +1,41 @@ +<?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 + --> + +<!-- Touch handle for the GlowPadView widget on the incoming call screen --> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + + <!-- Video call icon on tinted floating action bar background. --> + <item + android:state_enabled="true" + android:state_active="false" + android:state_focused="false"> + <layer-list> + <item> + <bitmap + android:src="@drawable/fab_teal_background" + android:tint="@color/glowpad_incoming_widget_background_tint" /> + </item> + <item> + <bitmap + android:gravity="center" + android:src="@drawable/ic_videocam" + android:tint="@color/glowpad_incoming_widget_tint" /> + </item> + </layer-list> + </item> + +</selector> diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_video.xml b/InCallUI/res/drawable/ic_lockscreen_answer_video.xml new file mode 100644 index 000000000..05577979a --- /dev/null +++ b/InCallUI/res/drawable/ic_lockscreen_answer_video.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 + --> +<!-- Used with incoming call wigdet. --> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:state_enabled="true" android:state_active="false" android:state_focused="false" + android:drawable="@drawable/ic_lockscreen_answer_video_normal_layer"/> + <item + android:state_enabled="true" android:state_active="true" android:state_focused="false" + android:drawable="@drawable/ic_lockscreen_answer_video_activated_layer" /> + <item + android:state_enabled="true" android:state_active="false" android:state_focused="true" + android:drawable="@drawable/ic_lockscreen_answer_video_activated_layer" /> +</selector> diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_video_activated_layer.xml b/InCallUI/res/drawable/ic_lockscreen_answer_video_activated_layer.xml new file mode 100644 index 000000000..3cb769223 --- /dev/null +++ b/InCallUI/res/drawable/ic_lockscreen_answer_video_activated_layer.xml @@ -0,0 +1,25 @@ +<?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 + --> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@drawable/fab_teal_background" /> + <item> + <bitmap + android:gravity="center" + android:src="@drawable/ic_videocam" + android:tint="@color/glowpad_widget_active_color" /> + </item> +</layer-list> diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_video_normal_layer.xml b/InCallUI/res/drawable/ic_lockscreen_answer_video_normal_layer.xml new file mode 100644 index 000000000..708bbcc9c --- /dev/null +++ b/InCallUI/res/drawable/ic_lockscreen_answer_video_normal_layer.xml @@ -0,0 +1,33 @@ +<?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 + --> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <!-- A fake circle to fix the size of this layer asset. --> + <item> + <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval"> + <solid android:color="#00000000"/> + <size + android:width="@dimen/incoming_call_widget_circle_size" + android:height="@dimen/incoming_call_widget_circle_size" /> + </shape> + </item> + <item> + <bitmap + android:gravity="center" + android:src="@drawable/ic_videocam" + android:tint="@color/glowpad_call_widget_normal_tint" /> + </item> +</layer-list> |