diff --git a/InCallUI/res/layout/answer_fragment.xml b/InCallUI/res/layout/answer_fragment.xml
new file mode 100644
index 0000000..bfe2303
--- /dev/null
+++ b/InCallUI/res/layout/answer_fragment.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- TODO(klp): move out to separate file -->
+<com.android.incallui.AnswerUi
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:dc="http://schemas.android.com/apk/res-auto"
+
+        android:id="@+id/glow_pad_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/glowpadview_margin_bottom"
+        android:focusable="true"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:gravity="center"
+        android:layout_gravity="center_vertical"
+
+        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:handleDrawable="@drawable/ic_in_call_touch_handle"
+        dc:outerRingDrawable="@*android:drawable/ic_lockscreen_outerring"
+        dc:outerRadius="@dimen/glowpadview_target_placement_radius"
+        dc:innerRadius="@dimen/glowpadview_inner_radius"
+        dc:snapMargin="@dimen/glowpadview_snap_margin"
+        dc:feedbackCount="1"
+        dc:vibrationDuration="20"
+        dc:glowRadius="@dimen/glowpadview_glow_radius"
+        dc:pointDrawable="@*android:drawable/ic_lockscreen_glowdot"
+        />
diff --git a/InCallUI/res/layout/incall_screen.xml b/InCallUI/res/layout/incall_screen.xml
index 32159a6..01180ee 100644
--- a/InCallUI/res/layout/incall_screen.xml
+++ b/InCallUI/res/layout/incall_screen.xml
@@ -26,30 +26,6 @@
           android:layout_weight="1"
           android:background="#ddd"/>
 
-    <!-- TODO(klp): move out to separate file -->
-    <com.android.incallui.widget.multiwaveview.GlowPadView
-            android:id="@+id/glow_pad_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/glowpadview_margin_bottom"
-            android:focusable="true"
-            android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true"
-            android:gravity="center"
-            android:layout_gravity="center_vertical"
 
-            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:handleDrawable="@drawable/ic_in_call_touch_handle"
-            dc:outerRingDrawable="@*android:drawable/ic_lockscreen_outerring"
-            dc:outerRadius="@dimen/glowpadview_target_placement_radius"
-            dc:innerRadius="@dimen/glowpadview_inner_radius"
-            dc:snapMargin="@dimen/glowpadview_snap_margin"
-            dc:feedbackCount="1"
-            dc:vibrationDuration="20"
-            dc:glowRadius="@dimen/glowpadview_glow_radius"
-            dc:pointDrawable="@*android:drawable/ic_lockscreen_glowdot"
-            />
 
 </LinearLayout>