Move glowpad to call card fragment.
- Move the answer fragment into the call card so that it lays out
correctly over the contact photo.
- Update glowpad color so it is partially transparent.
- Instead of disabling end call button, hide it if it is not enabled.
Bug: 14658215
Change-Id: Ibaaf0b1b0d3afc4c9e3e8e9f5c322fccd0ffc321
diff --git a/InCallUI/res/layout/answer_fragment.xml b/InCallUI/res/layout/answer_fragment.xml
index 15c2093..92630b8 100644
--- a/InCallUI/res/layout/answer_fragment.xml
+++ b/InCallUI/res/layout/answer_fragment.xml
@@ -25,7 +25,7 @@
android:focusable="true"
android:layout_centerHorizontal="true"
android:gravity="center"
- android:background="@android:color/black"
+ android:background="@color/glowpad_background_color"
android:visibility="gone"
dc:targetDrawables="@array/incoming_call_widget_3way_targets"
diff --git a/InCallUI/res/layout/call_card.xml b/InCallUI/res/layout/call_card.xml
index 07ecef0..6a06cab 100644
--- a/InCallUI/res/layout/call_card.xml
+++ b/InCallUI/res/layout/call_card.xml
@@ -75,6 +75,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
+ <fragment android:name="com.android.incallui.AnswerFragment"
+ android:id="@+id/answerFragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentBottom="true"
+ android:layout_centerHorizontal="true"
+ android:gravity="top"
+ android:layout_gravity="bottom|center_horizontal"
+ android:layout_marginBottom="@dimen/glowpadview_margin_bottom"
+ android:visibility="gone" />
+
</FrameLayout>
</LinearLayout>
diff --git a/InCallUI/res/layout/incall_screen.xml b/InCallUI/res/layout/incall_screen.xml
index 45bf37a..9f75695 100644
--- a/InCallUI/res/layout/incall_screen.xml
+++ b/InCallUI/res/layout/incall_screen.xml
@@ -27,18 +27,6 @@
android:layout_alignParentTop="true"
android:layout_alignParentStart="true" />
-
- <fragment android:name="com.android.incallui.AnswerFragment"
- android:id="@+id/answerFragment"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_centerHorizontal="true"
- android:gravity="top"
- android:layout_gravity="bottom|center_horizontal"
- android:layout_marginBottom="@dimen/glowpadview_margin_bottom"
- android:visibility="gone" />
-
<fragment android:name="com.android.incallui.ConferenceManagerFragment"
android:id="@+id/conferenceManagerFragment"
android:layout_width="match_parent"