diff options
Diffstat (limited to 'phone/res/layout/incall_touch_ui.xml')
| -rw-r--r-- | phone/res/layout/incall_touch_ui.xml | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/phone/res/layout/incall_touch_ui.xml b/phone/res/layout/incall_touch_ui.xml index 0217d02..a85f8cc 100644 --- a/phone/res/layout/incall_touch_ui.xml +++ b/phone/res/layout/incall_touch_ui.xml @@ -64,8 +64,7 @@ android:visibility="gone"> <ImageButton android:id="@+id/holdButton" style="@style/InCallRoundTouchButton" - android:src="@drawable/ic_in_call_touch_round_hold" - android:contentDescription="@string/onscreenHoldText" /> + android:src="@drawable/ic_in_call_touch_round_hold" /> <TextView android:id="@+id/holdButtonLabel" style="@style/InCallRoundButtonLabel" /> </LinearLayout> @@ -79,8 +78,7 @@ android:visibility="gone"> <ImageButton android:id="@+id/swapButton" style="@style/InCallRoundTouchButton" - android:src="@drawable/ic_in_call_touch_round_swap" - android:contentDescription="@string/onscreenSwapCallsText"/> + android:src="@drawable/ic_in_call_touch_round_swap" /> <TextView android:id="@+id/swapButtonLabel" style="@style/InCallRoundButtonLabel" /> </LinearLayout> @@ -96,8 +94,7 @@ android:visibility="gone"> <ImageButton android:id="@+id/cdmaMergeButton" style="@style/InCallRoundTouchButton" - android:src="@drawable/ic_in_call_touch_round_merge_call" - android:contentDescription="@string/onscreenMergeCallsText" /> + android:src="@drawable/ic_in_call_touch_round_merge_call" /> <TextView style="@style/InCallRoundButtonLabel" android:text="@string/onscreenMergeCallsText" /> @@ -105,11 +102,9 @@ <!-- DTMF dialpad shown in the upper part of the screen (above the main cluster of buttons.) --> - <ViewStub android:id="@+id/non_drawer_dialpad_stub" - android:layout="@layout/non_drawer_dialpad" - android:layout_width="match_parent" - android:layout_height="match_parent" - /> + <!-- TODO: this should be a ViewStub, and should only get inflated + when first needed. --> + <include layout="@layout/non_drawer_dialpad"/> <!-- Main cluster of onscreen buttons on the lower part of the screen. --> <LinearLayout android:id="@+id/bottomButtons" @@ -182,7 +177,7 @@ android:layout_height="wrap_content" android:text="@string/onscreenEndCallText" android:drawableTop="@drawable/ic_in_call_touch_end" - android:textColor="@color/end_call_button_text" + android:textColor="@color/incall_endButtonLabel" /> <!-- "Dialpad" --> |