diff --git a/InCallUI/res/layout/answer_fragment.xml b/InCallUI/res/layout/answer_fragment.xml
index 1594f03..f6b1320 100644
--- a/InCallUI/res/layout/answer_fragment.xml
+++ b/InCallUI/res/layout/answer_fragment.xml
@@ -31,9 +31,9 @@
         android:layout_gravity="bottom|center_horizontal"
         android:background="@android:color/black"
 
-        dc:targetDrawables="@array/incoming_call_widget_3way_targets"
-        dc:targetDescriptions="@array/incoming_call_widget_3way_target_descriptions"
-        dc:directionDescriptions="@array/incoming_call_widget_3way_direction_descriptions"
+        dc:targetDrawables="@array/incoming_call_widget_2way_targets"
+        dc:targetDescriptions="@array/incoming_call_widget_2way_target_descriptions"
+        dc:directionDescriptions="@array/incoming_call_widget_2way_direction_descriptions"
         dc:handleDrawable="@drawable/ic_in_call_touch_handle"
         dc:outerRingDrawable="@*android:drawable/ic_lockscreen_outerring"
         dc:outerRadius="@dimen/glowpadview_target_placement_radius"
diff --git a/InCallUI/src/com/android/incallui/AnswerPresenter.java b/InCallUI/src/com/android/incallui/AnswerPresenter.java
index f53807a..78ee0f1 100644
--- a/InCallUI/src/com/android/incallui/AnswerPresenter.java
+++ b/InCallUI/src/com/android/incallui/AnswerPresenter.java
@@ -76,7 +76,8 @@
     }
 
     public void onText() {
-        getUi().showMessageDialogue();
+        // No-op for now.  b/10424370
+        // getUi().showMessageDialogue();
     }
 
     public void rejectCallWithMessage(String message) {