Connecting answer call action in UI to service.
Also starting pinging animation for glow pad.
Change-Id: Ifac94582b8448c288a07577db02633bf9452ee56
diff --git a/InCallUI/res/layout/answer_fragment.xml b/InCallUI/res/layout/answer_fragment.xml
index bfe2303..b334a12 100644
--- a/InCallUI/res/layout/answer_fragment.xml
+++ b/InCallUI/res/layout/answer_fragment.xml
@@ -1,18 +1,19 @@
<?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.
--->
+<!--
+ ~ 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
@@ -27,7 +28,8 @@
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:gravity="center"
- android:layout_gravity="center_vertical"
+ android:layout_gravity="bottom|center_horizontal"
+ android:background="#000"
dc:targetDrawables="@array/incoming_call_widget_3way_targets"
dc:targetDescriptions="@array/incoming_call_widget_3way_target_descriptions"
diff --git a/InCallUI/res/layout/incall_screen.xml b/InCallUI/res/layout/incall_screen.xml
index 01180ee..d9f7bdf 100644
--- a/InCallUI/res/layout/incall_screen.xml
+++ b/InCallUI/res/layout/incall_screen.xml
@@ -15,17 +15,14 @@
-->
<!-- In-call Phone UI; see InCallActivity.java. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:dc="http://schemas.android.com/apk/res-auto"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:id="@+id/main">
- <View android:layout_width="wrap_content"
- android:layout_height="0dp"
- android:layout_weight="1"
+ <View android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:background="#ddd"/>
-
-
-</LinearLayout>
+</FrameLayout>