summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-04-17 00:21:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-17 00:21:20 +0000
commit5dd8fd1d2c3055c6b14e9d21e9999fe91e39beca (patch)
tree116af0412b0d5ab6dc79d765b52630ab0444cefd
parent4835bf85d6908e55630d58d889f654acbfe011bb (diff)
parentda5397b3d9f6548bd2bdff1bf50e7472d7831f4f (diff)
Merge "Don't make all buttons invisible at startup"
-rw-r--r--InCallUI/res/layout/call_button_fragment.xml12
1 files changed, 4 insertions, 8 deletions
diff --git a/InCallUI/res/layout/call_button_fragment.xml b/InCallUI/res/layout/call_button_fragment.xml
index 3629b8a3b..7f429c76e 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"