commit cb687e7d20c2633d65f22a961e7080ea5692e554
author Andrew Lee <anwlee@google.com> Fri Apr 17 21:50:27 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 17 21:50:28 2015 +0000
tree 2be7f81afe596dd206fc88ba523795e4d9b329db
parent 5dd8fd1d2c3055c6b14e9d21e9999fe91e39beca
parent 9bcd0f1e66d4a8aa9e2e6b2b6d2c3efd6ffddb75

Merge "Make createPresenter() and getUi() public."

InCallUI/res/layout/call_button_fragment.xml

diff --git a/InCallUI/res/layout/call_button_fragment.xml b/InCallUI/res/layout/call_button_fragment.xml
index 3629b8a..7f429c7 100644
--- a/InCallUI/res/layout/call_button_fragment.xml
+++ b/InCallUI/res/layout/call_button_fragment.xml
@@ -67,8 +67,7 @@
         <ToggleButton android:id="@+id/audioButton"
             style="@style/InCallCompoundButton"
             android:background="@drawable/btn_compound_audio"
-            android:contentDescription="@string/audio_mode_speaker"
-            android:visibility="gone" />
+            android:contentDescription="@string/audio_mode_speaker" />
 
         <!-- "Change to audio call" for video calls. -->
         <ImageButton android:id="@+id/changeToVoiceButton"
@@ -83,8 +82,7 @@
         <ToggleButton android:id="@+id/muteButton"
             style="@style/InCallCompoundButton"
             android:background="@drawable/btn_compound_mute"
-            android:contentDescription="@string/onscreenMuteText"
-            android:visibility="gone" />
+            android:contentDescription="@string/onscreenMuteText" />
 
         <!-- CENTER SLOT ======================================================================= -->
 
@@ -92,8 +90,7 @@
         <ToggleButton android:id="@+id/dialpadButton"
             style="@style/InCallCompoundButton"
             android:background="@drawable/btn_compound_dialpad"
-            android:contentDescription="@string/onscreenShowDialpadText"
-            android:visibility="gone" />
+            android:contentDescription="@string/onscreenShowDialpadText" />
 
         <!-- MIDDLE RIGHT SLOT ================================================================= -->
 
@@ -104,8 +101,7 @@
         <ToggleButton android:id="@+id/holdButton"
             style="@style/InCallCompoundButton"
             android:background="@drawable/btn_compound_hold"
-            android:contentDescription="@string/onscreenHoldText_unselected"
-            android:visibility="gone" />
+            android:contentDescription="@string/onscreenHoldText_unselected" />
 
         <!-- "Swap" (or "Manage calls" in some CDMA states) -->
         <ImageButton android:id="@+id/swapButton"