From 1be65f37ee70f1b849a8447dbdfb55f43e047af3 Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Fri, 10 Apr 2015 12:31:23 -0700
Subject: Cleanup AnswerFragment glowpad UI

* For incoming video requests, only show answer as video, answer as
audio, or reject
* For upgrade requests, only show upgrade to video, don't upgrade to
video

* Nuke unused tx/rx only assets

Bug: 20090411
Change-Id: I51093bb702981256809020908442eb98b0d17606
---
 .../res/drawable/ic_lockscreen_answer_rx_video.xml | 30 ------------------
 ..._lockscreen_answer_rx_video_activated_layer.xml | 28 -----------------
 .../ic_lockscreen_answer_rx_video_normal_layer.xml | 36 ----------------------
 .../res/drawable/ic_lockscreen_answer_tx_video.xml | 30 ------------------
 ..._lockscreen_answer_tx_video_activated_layer.xml | 28 -----------------
 .../ic_lockscreen_answer_tx_video_normal_layer.xml | 36 ----------------------
 InCallUI/res/values/array.xml                      | 21 +++++--------
 .../src/com/android/incallui/GlowPadWrapper.java   |  8 -----
 8 files changed, 8 insertions(+), 209 deletions(-)
 delete mode 100644 InCallUI/res/drawable/ic_lockscreen_answer_rx_video.xml
 delete mode 100644 InCallUI/res/drawable/ic_lockscreen_answer_rx_video_activated_layer.xml
 delete mode 100644 InCallUI/res/drawable/ic_lockscreen_answer_rx_video_normal_layer.xml
 delete mode 100644 InCallUI/res/drawable/ic_lockscreen_answer_tx_video.xml
 delete mode 100644 InCallUI/res/drawable/ic_lockscreen_answer_tx_video_activated_layer.xml
 delete mode 100644 InCallUI/res/drawable/ic_lockscreen_answer_tx_video_normal_layer.xml

(limited to 'InCallUI')

diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_rx_video.xml b/InCallUI/res/drawable/ic_lockscreen_answer_rx_video.xml
deleted file mode 100644
index c5a41d814..000000000
--- a/InCallUI/res/drawable/ic_lockscreen_answer_rx_video.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2014, The Linux Foundation. All rights reserved.
-  ~ Not a Contribution.
-  ~ 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_rx_video_normal_layer"/>
-    <item
-        android:state_enabled="true" android:state_active="true"  android:state_focused="false"
-        android:drawable="@drawable/ic_lockscreen_answer_rx_video_activated_layer" />
-    <item
-        android:state_enabled="true" android:state_active="false"  android:state_focused="true"
-        android:drawable="@drawable/ic_lockscreen_answer_rx_video_activated_layer" />
-</selector>
diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_rx_video_activated_layer.xml b/InCallUI/res/drawable/ic_lockscreen_answer_rx_video_activated_layer.xml
deleted file mode 100644
index 750ef5e26..000000000
--- a/InCallUI/res/drawable/ic_lockscreen_answer_rx_video_activated_layer.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2014, The Linux Foundation. All rights reserved.
-  ~ Not a Contribution.
-  ~ 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_red" />
-    <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@drawable/ic_rx_videocam"
-            android:tint="@color/glowpad_widget_active_color"
-            android:autoMirrored="true" />
-    </item>
-</layer-list>
diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_rx_video_normal_layer.xml b/InCallUI/res/drawable/ic_lockscreen_answer_rx_video_normal_layer.xml
deleted file mode 100644
index 5efd3d142..000000000
--- a/InCallUI/res/drawable/ic_lockscreen_answer_rx_video_normal_layer.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2014, The Linux Foundation. All rights reserved.
-  ~ Not a Contribution.
-  ~ 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_rx_videocam"
-            android:tint="@color/glowpad_call_widget_normal_tint"
-            android:autoMirrored="true" />
-    </item>
-</layer-list>
diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_tx_video.xml b/InCallUI/res/drawable/ic_lockscreen_answer_tx_video.xml
deleted file mode 100644
index 15d11978e..000000000
--- a/InCallUI/res/drawable/ic_lockscreen_answer_tx_video.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2014, The Linux Foundation. All rights reserved.
-  ~ Not a Contribution.
-  ~ 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_tx_video_normal_layer"/>
-    <item
-        android:state_enabled="true" android:state_active="true"  android:state_focused="false"
-        android:drawable="@drawable/ic_lockscreen_answer_tx_video_activated_layer" />
-    <item
-        android:state_enabled="true" android:state_active="false"  android:state_focused="true"
-        android:drawable="@drawable/ic_lockscreen_answer_tx_video_activated_layer" />
-</selector>
diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_tx_video_activated_layer.xml b/InCallUI/res/drawable/ic_lockscreen_answer_tx_video_activated_layer.xml
deleted file mode 100644
index c1dca4d06..000000000
--- a/InCallUI/res/drawable/ic_lockscreen_answer_tx_video_activated_layer.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2014, The Linux Foundation. All rights reserved.
-  ~ Not a Contribution.
-  ~ 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_green" />
-    <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@drawable/ic_tx_videocam"
-            android:tint="@color/glowpad_widget_active_color"
-            android:autoMirrored="true" />
-    </item>
-</layer-list>
diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_tx_video_normal_layer.xml b/InCallUI/res/drawable/ic_lockscreen_answer_tx_video_normal_layer.xml
deleted file mode 100644
index b0ad943dc..000000000
--- a/InCallUI/res/drawable/ic_lockscreen_answer_tx_video_normal_layer.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2014, The Linux Foundation. All rights reserved.
-  ~ Not a Contribution.
-  ~ 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_tx_videocam"
-            android:tint="@color/glowpad_call_widget_normal_tint"
-            android:autoMirrored="true" />
-    </item>
-</layer-list>
diff --git a/InCallUI/res/values/array.xml b/InCallUI/res/values/array.xml
index 46592e126..2e38c2c46 100644
--- a/InCallUI/res/values/array.xml
+++ b/InCallUI/res/values/array.xml
@@ -74,8 +74,6 @@
         <item>@null</item>
         <item>@drawable/ic_lockscreen_decline</item>
         <item>@drawable/ic_lockscreen_answer_video</item>
-        <item>@drawable/ic_lockscreen_answer_tx_video</item>
-        <item>@drawable/ic_lockscreen_answer_rx_video</item>
     </array>
     <array name="incoming_call_widget_video_without_sms_target_descriptions">
         <item>@string/description_target_answer_video_call</item>
@@ -100,8 +98,6 @@
         <item>@drawable/ic_lockscreen_text</item>
         <item>@drawable/ic_lockscreen_decline</item>
         <item>@drawable/ic_lockscreen_answer</item>
-        <item>@drawable/ic_lockscreen_answer_tx_video</item>
-        <item>@drawable/ic_lockscreen_answer_rx_video</item>
     </array>
     <array name="incoming_call_widget_video_with_sms_target_descriptions">
         <item>@string/description_target_answer_video_call</item>
@@ -126,8 +122,6 @@
         <item>@null</item>
         <item>@drawable/ic_lockscreen_decline</item>
         <item>@drawable/ic_lockscreen_answer</item>
-        <item>@drawable/ic_lockscreen_answer_tx_video</item>
-        <item>@drawable/ic_lockscreen_answer_rx_video</item>
     </array>
     <array name="incoming_call_widget_video_upgrade_request_target_descriptions">
         <item>@string/description_target_accept_upgrade_to_video_request</item>
@@ -152,26 +146,27 @@
 
     <!-- For accept/reject upgrade to video transmit in active video call
          - Accept upgrade to video request (drag right)
-         - Decline upgrade to video request (drag left)-->
+         - Decline upgrade to video request (drag left)
+         TODO: This should be automatically rejected in the lower layers -->
     <array name="incoming_call_widget_video_transmit_accept_reject_request_targets">
-        <item>@drawable/ic_lockscreen_answer_tx_video</item>
+        <item>@drawable/ic_lockscreen_answer_video</item>
         <item>@drawable/ic_lockscreen_decline</item>
     </array>
     <array name="incoming_call_widget_video_transmit_request_target_descriptions">
-        <item>@string/description_target_accept_upgrade_to_video_transmit_request</item>
-        <item>@string/description_target_decline_upgrade_to_video_transmit_request</item>
+        <item>@string/description_target_accept_upgrade_to_video_request</item>
+        <item>@string/description_target_decline_upgrade_to_video_request</item>
     </array>
 
     <!-- For accept/reject upgrade to video receive in active video call
          - Accept upgrade to video request (drag right)
          - Decline upgrade to video request (drag left)-->
     <array name="incoming_call_widget_video_receive_accept_reject_request_targets">
-        <item>@drawable/ic_lockscreen_answer_rx_video</item>
+        <item>@drawable/ic_lockscreen_answer_video</item>
         <item>@drawable/ic_lockscreen_decline</item>
     </array>
     <array name="incoming_call_widget_video_receive_request_target_descriptions">
-        <item>@string/description_target_accept_upgrade_to_video_receive_request</item>
-        <item>@string/description_target_decline_upgrade_to_video_receive_request</item>
+        <item>@string/description_target_accept_upgrade_to_video_request</item>
+        <item>@string/description_target_decline_upgrade_to_video_request</item>
     </array>
 
 </resources>
diff --git a/InCallUI/src/com/android/incallui/GlowPadWrapper.java b/InCallUI/src/com/android/incallui/GlowPadWrapper.java
index 584ce65de..58a5f30ea 100644
--- a/InCallUI/src/com/android/incallui/GlowPadWrapper.java
+++ b/InCallUI/src/com/android/incallui/GlowPadWrapper.java
@@ -128,14 +128,6 @@ public class GlowPadWrapper extends GlowPadView implements GlowPadView.OnTrigger
                 mAnswerListener.onAnswer(VideoProfile.VideoState.BIDIRECTIONAL, getContext());
                 mTargetTriggered = true;
                 break;
-            case R.drawable.ic_lockscreen_answer_tx_video:
-                mAnswerListener.onAnswer(VideoProfile.VideoState.TX_ENABLED, getContext());
-                mTargetTriggered = true;
-                break;
-            case R.drawable.ic_lockscreen_answer_rx_video:
-                mAnswerListener.onAnswer(VideoProfile.VideoState.RX_ENABLED, getContext());
-                mTargetTriggered = true;
-                break;
             case R.drawable.ic_toolbar_video_off:
                 InCallPresenter.getInstance().declineUpgradeRequest(getContext());
                 mTargetTriggered = true;
-- 
cgit v1.2.3