From e9e6f43ab11b303e3604b8807cd10272a15ed3b3 Mon Sep 17 00:00:00 2001
From: Santos Cordon <santoscordon@google.com>
Date: Tue, 27 Aug 2013 19:02:12 -0700
Subject: Fixing position of Glowpadview to reveal more of contact's photo.

update layout files to match what previous phone used to do.

bug:10510721
Change-Id: I1bb1a7c8207043a5657940d3209ba53e1a332285
---
 InCallUI/res/layout/answer_fragment.xml | 5 -----
 InCallUI/res/layout/incall_screen.xml   | 6 ++++--
 InCallUI/res/values/dimens.xml          | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'InCallUI/res')

diff --git a/InCallUI/res/layout/answer_fragment.xml b/InCallUI/res/layout/answer_fragment.xml
index f6b132091..8b553a6a8 100644
--- a/InCallUI/res/layout/answer_fragment.xml
+++ b/InCallUI/res/layout/answer_fragment.xml
@@ -19,16 +19,11 @@
 <com.android.incallui.GlowPadWrapper
         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="bottom|center_horizontal"
         android:background="@android:color/black"
 
         dc:targetDrawables="@array/incoming_call_widget_2way_targets"
diff --git a/InCallUI/res/layout/incall_screen.xml b/InCallUI/res/layout/incall_screen.xml
index 25241baca..86f67c989 100644
--- a/InCallUI/res/layout/incall_screen.xml
+++ b/InCallUI/res/layout/incall_screen.xml
@@ -62,7 +62,9 @@
               android:layout_height="wrap_content"
               android:layout_alignParentBottom="true"
               android:layout_centerHorizontal="true"
-              android:gravity="center"
-              android:layout_gravity="bottom|center_horizontal" />
+              android:gravity="top"
+              android:layout_gravity="bottom|center_horizontal"
+              android:layout_marginBottom="@dimen/glowpadview_margin_bottom"
+              android:visibility="gone" />
 
 </FrameLayout>
diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml
index c0a001cdc..1d9497170 100644
--- a/InCallUI/res/values/dimens.xml
+++ b/InCallUI/res/values/dimens.xml
@@ -113,7 +113,7 @@
     <!-- Default distance from each snap target that GlowPadView considers a "hit" -->
     <dimen name="glowpadview_inner_radius">15dip</dimen>
 
-    <dimen name="glowpadview_margin_bottom">-64dip</dimen>
+    <dimen name="glowpadview_margin_bottom">-48dip</dimen>
     <dimen name="glowpadview_margin_right">0dip</dimen>
 
 </resources>
-- 
cgit v1.2.3