From e37b2d8fbe53ce4c11472182076c70a10f44f371 Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Wed, 16 Jul 2014 16:45:25 -0700
Subject: Delete auxiliary action button in call button fragment.

Bug:16014280
Change-Id: I28546c95fda0174a4e50a2efd321982d00c4e86f
---
 InCallUI/res/layout/call_button_fragment.xml | 48 +++++++++++-----------------
 1 file changed, 19 insertions(+), 29 deletions(-)

(limited to 'InCallUI/res')

diff --git a/InCallUI/res/layout/call_button_fragment.xml b/InCallUI/res/layout/call_button_fragment.xml
index 8969cbb37..8397ace97 100644
--- a/InCallUI/res/layout/call_button_fragment.xml
+++ b/InCallUI/res/layout/call_button_fragment.xml
@@ -63,24 +63,18 @@
         android:background="@color/button_background_color"
         android:gravity="bottom|center_horizontal">
 
-        <!-- This row has either 4 or 5 buttons, depending on
-       whether the device supports "Hold" (i.e. 4 buttons on
-       CDMA devices, 5 buttons on GSM devices.)  The buttons
-       are interspersed with 'layout_weight="1"' placeholder
-       views so that they'll be spaced evenly in both cases.
-
-       But note there are a couple of *pairs* of buttons that share a
-       single "slot", namely Hold/Swap and Add/Merge.  For these, the
-       code in InCallTouchUi is responsible for making sure that at any
-       point exactly one of the pair is VISIBLE and the other is
-       GONE. -->
+        <!-- This row has either 4 or 5 buttons. This may depend on whether the device supports
+             "Hold" (i.e. 4 buttons on CDMA devices, 5 buttons on GSM devices.) or whether it is in
+             a video call.
+
+             There are a couple of *pairs* of buttons that share a single "slot", namely Hold/Swap
+             and Add/Merge.  For these, the code in InCallTouchUi is responsible for making sure
+             that at any point exactly one of the pair is VISIBLE and the other is GONE. -->
 
         <!-- "Audio mode" -->
-        <!-- This is a multi-mode button that can behave either like a
-             simple "compound button" with two states *or* like an
-             action button that brings up a popup menu; see
-             btn_compound_audio.xml and InCallTouchUi.updateAudioButton()
-             for the full details. -->
+        <!-- This is a multi-mode button that can behave either like a simple "compound button" with
+             two states *or* like an action button that brings up a popup menu; see
+             btn_compound_audio.xml and InCallTouchUi.updateAudioButton() for the full details. -->
         <ImageButton android:id="@+id/audioButton"
             style="@style/InCallButton"
             android:background="@drawable/btn_compound_audio"
@@ -100,9 +94,9 @@
             android:background="@drawable/btn_compound_dialpad"
             android:contentDescription="@string/onscreenShowDialpadText" />
 
-        <!-- This slot is either "Hold" or "Swap", depending on
-             the state of the call.   One or the other of these
-             must always be set to GONE. -->
+        <!-- This slot is either "Hold" or "Swap", depending on the state of the call. One or the
+             other of these must always be set to GONE. -->
+
         <!-- "Hold" -->
         <!-- This is a "compound button": it has checked and unchecked states. -->
         <ImageButton android:id="@+id/holdButton"
@@ -117,9 +111,9 @@
             android:contentDescription="@string/onscreenSwapCallsText"
             android:visibility="gone" />
 
-        <!-- This slot is either "Add" or "Merge", depending on
-             the state of the call.  One or the other of these
-             must always be set to GONE. -->
+        <!-- This slot is either "Add" or "Merge", depending on the state of the call.  One or the
+             other of these must always be set to GONE. -->
+
         <!-- "Add Call" -->
         <ImageButton android:id="@+id/addButton"
             style="@style/InCallButton"
@@ -128,19 +122,15 @@
             android:visibility="gone" />
 
         <!-- "Merge calls" -->
-        <!-- This button is used only on GSM devices, where we know
-             that "Add" and "Merge" are never available at the same time.
-             The "Merge" button for CDMA devices is "cdmaMergeButton" above. -->
+        <!-- This button is used only on GSM devices, where we know that "Add" and "Merge" are never
+             available at the same time. The "Merge" button for CDMA devices is "cdmaMergeButton"
+             above. -->
         <ImageButton android:id="@+id/mergeButton"
             style="@style/InCallButton"
             android:background="@drawable/btn_merge"
             android:contentDescription="@string/onscreenMergeCallsText"
             android:visibility="gone" />
 
-        <ImageButton android:id="@+id/auxiliaryActionButton"
-            style="@style/InCallButton"
-            android:visibility="gone" />
-
     </LinearLayout>
 
 </LinearLayout>
-- 
cgit v1.2.3