Merge "incallui: make navigation bar translucent + other fixes" into cm-11.0

8 files changed, 146 insertions, 69 deletions

diff --git a/res/layout-land/incall_screen.xml b/res/layout-land/incall_screen.xml
index e3cc9522..e158d4e7 100644
--- a/res/layout-land/incall_screen.xml
+++ b/res/layout-land/incall_screen.xml
@@ -22,40 +22,38 @@
     android:background="@color/incall_button_background"
     android:id="@+id/main">
 
-    <LinearLayout
+    <FrameLayout
         android:id="@+id/in_call_and_button_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal">
+        android:layout_height="match_parent">
+
+        <fragment
+            android:name="com.android.incallui.CallCardFragment"
+            android:id="@+id/callCardFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
         <RelativeLayout
-             android:id="@+id/in_call_card_container"
-             android:layout_width="0dp"
-             android:layout_height="match_parent"
-             android:layout_weight="1">
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
 
-            <fragment
-                android:name="com.android.incallui.CallCardFragment"
-                android:id="@+id/callCardFragment"
-                android:layout_width="match_parent"
+            <fragment android:name="com.android.incallui.CallButtonFragment"
+                android:id="@+id/callButtonFragment"
+                android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentStart="true" />
+                android:layout_alignParentEnd="true" />
+
             <fragment
                 android:name="com.android.incallui.DialpadFragment"
                 android:id="@+id/dialpadFragment"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_alignParentTop="true"
+                android:layout_toStartOf="@id/callButtonFragment"
                 android:layout_alignParentStart="true" />
-        </RelativeLayout>
 
-        <fragment android:name="com.android.incallui.CallButtonFragment"
-                  android:id="@+id/callButtonFragment"
-                  android:layout_width="wrap_content"
-                  android:layout_height="match_parent"/>
+        </RelativeLayout>
 
-    </LinearLayout>
+    </FrameLayout>
 
     <fragment android:name="com.android.incallui.AnswerFragment"
               android:id="@+id/answerFragment"
diff --git a/res/layout-land/incall_screen_msim.xml b/res/layout-land/incall_screen_msim.xml
new file mode 100644
index 00000000..97f5c9e8
--- /dev/null
+++ b/res/layout-land/incall_screen_msim.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 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.
+-->
+
+<!-- In-call Phone UI; see MsimInCallActivity.java. -->
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/incall_button_background"
+    android:id="@+id/main">
+
+    <FrameLayout
+        android:id="@+id/in_call_and_button_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <fragment
+            android:name="com.android.incallui.CallCardFragment"
+            android:id="@+id/callCardFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <RelativeLayout
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+
+            <fragment android:name="com.android.incallui.CallButtonFragment"
+                android:id="@+id/callButtonFragment"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignParentEnd="true" />
+
+            <fragment
+                android:name="com.android.incallui.DialpadFragment"
+                android:id="@+id/dialpadFragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_toStartOf="@id/callButtonFragment"
+                android:layout_alignParentStart="true" />
+
+        </RelativeLayout>
+
+    </FrameLayout>
+
+    <fragment android:name="com.android.incallui.MsimAnswerFragment"
+              android:id="@+id/answerFragment"
+              android:layout_width="wrap_content"
+              android:layout_height="match_parent"
+              android:layout_alignParentEnd="true"
+              android:layout_centerVertical="true"
+              android:gravity="start"
+              android:layout_gravity="end|center_vertical"
+              android:layout_marginEnd="@dimen/glowpadview_margin_bottom"
+              android:visibility="gone" />
+
+    <fragment android:name="com.android.incallui.ConferenceManagerFragment"
+              android:id="@+id/conferenceManagerFragment"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:layout_alignParentTop="true"
+              android:layout_alignParentStart="true"
+              android:layout_alignParentBottom="true"
+              android:layout_alignParentEnd="true" />
+
+</FrameLayout>
diff --git a/res/layout/conference_manager_fragment.xml b/res/layout/conference_manager_fragment.xml
index a8fda2c2..983b795c 100644
--- a/res/layout/conference_manager_fragment.xml
+++ b/res/layout/conference_manager_fragment.xml
@@ -23,6 +23,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:visibility="gone"
+                android:fitsSystemWindows="true"
                 >
     <!-- This original header (with timer) is currently not being used,
          but may be of use in the future. -->
diff --git a/res/layout/dtmf_twelve_key_dialer_view.xml b/res/layout/dtmf_twelve_key_dialer_view.xml
index d921ca34..9ff7142e 100644
--- a/res/layout/dtmf_twelve_key_dialer_view.xml
+++ b/res/layout/dtmf_twelve_key_dialer_view.xml
@@ -20,13 +20,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:layout_marginTop="1dip" >
+    android:layout_marginTop="1dip"
+    android:background="@color/background_dialpad" >
 
     <view class="com.android.incallui.DialpadFragment$HoverIgnoringLinearLayout"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/background_dialpad">
+        android:fitsSystemWindows="true">
 
 
         <!-- Display of the digits you've typed so far.
diff --git a/res/layout/incall_screen.xml b/res/layout/incall_screen.xml
index f7d9715f..5e6dfb5c 100644
--- a/res/layout/incall_screen.xml
+++ b/res/layout/incall_screen.xml
@@ -19,43 +19,41 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/incall_button_background"
+    android:background="@android:color/black"
     android:id="@+id/main">
 
-    <LinearLayout
+    <FrameLayout
         android:id="@+id/in_call_and_button_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
+
+        <fragment
+            android:name="com.android.incallui.CallCardFragment"
+            android:id="@+id/callCardFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
         <RelativeLayout
-             android:id="@+id/in_call_card_container"
              android:layout_width="match_parent"
-             android:layout_height="0dp"
-             android:layout_weight="1">
+             android:layout_height="match_parent">
 
-            <fragment
-                android:name="com.android.incallui.CallCardFragment"
-                android:id="@+id/callCardFragment"
+            <fragment android:name="com.android.incallui.CallButtonFragment"
+                android:id="@+id/callButtonFragment"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentStart="true" />
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true" />
+
             <fragment
                 android:name="com.android.incallui.DialpadFragment"
                 android:id="@+id/dialpadFragment"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentStart="true" />
-        </RelativeLayout>
+                android:layout_height="wrap_content"
+                android:layout_above="@id/callButtonFragment"
+                android:layout_alignParentTop="true" />
 
-        <fragment android:name="com.android.incallui.CallButtonFragment"
-                  android:id="@+id/callButtonFragment"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"/>
+        </RelativeLayout>
 
-    </LinearLayout>
+    </FrameLayout>
 
     <fragment android:name="com.android.incallui.AnswerFragment"
               android:id="@+id/answerFragment"
diff --git a/res/layout/incall_screen_msim.xml b/res/layout/incall_screen_msim.xml
index 52f79a9f..32ebec8d 100644
--- a/res/layout/incall_screen_msim.xml
+++ b/res/layout/incall_screen_msim.xml
@@ -18,49 +18,49 @@
      limitations under the License.
 -->
 
-<!-- In-call Phone UI; see InCallActivity.java. -->
+<!-- In-call Phone UI; see MsimInCallActivity.java. -->
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@android:color/black"
     android:id="@+id/main">
 
-    <LinearLayout
+    <FrameLayout
         android:id="@+id/in_call_and_button_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
+
+        <fragment
+            android:name="com.android.incallui.CallCardFragment"
+            android:id="@+id/callCardFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
         <RelativeLayout
-             android:id="@+id/in_call_card_container"
              android:layout_width="match_parent"
-             android:layout_height="0dp"
-             android:layout_weight="1">
+             android:layout_height="match_parent">
 
             <fragment
-                android:name="com.android.incallui.CallCardFragment"
-                android:id="@+id/callCardFragment"
+                android:name="com.android.incallui.CallButtonFragment"
+                android:id="@+id/callButtonFragment"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentStart="true" />
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true" />
+
             <fragment
                 android:name="com.android.incallui.DialpadFragment"
                 android:id="@+id/dialpadFragment"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentStart="true" />
-        </RelativeLayout>
+                android:layout_below="@id/callButtonFragment"
+                android:layout_alignParentTop="true" />
 
-        <fragment android:name="com.android.incallui.CallButtonFragment"
-                  android:id="@+id/callButtonFragment"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"/>
+        </RelativeLayout>
 
-    </LinearLayout>
+    </FrameLayout>
 
-    <fragment android:name="com.android.incallui.MSimAnswerFragment"
+    <fragment android:name="com.android.incallui.MsimAnswerFragment"
               android:id="@+id/answerFragment"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
diff --git a/res/layout/primary_call_info.xml b/res/layout/primary_call_info.xml
index 9a030a95..b1ee979e 100644
--- a/res/layout/primary_call_info.xml
+++ b/res/layout/primary_call_info.xml
@@ -35,7 +35,9 @@
     <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:background="@color/incall_call_banner_background"
+            android:fitsSystemWindows="true">
 
         <!-- "Call Banner" for primary call, the foregound or ringing call.
          The "call banner" is a block of info about a single call,
@@ -50,8 +52,7 @@
             android:paddingStart="@dimen/call_banner_side_padding"
             android:paddingEnd="@dimen/call_banner_side_padding"
             android:paddingTop="@dimen/call_banner_top_bottom_padding"
-            android:paddingBottom="@dimen/call_banner_top_bottom_padding"
-            android:background="@color/incall_call_banner_background">
+            android:paddingBottom="@dimen/call_banner_top_bottom_padding">
 
             <!-- Subscription id: it displays current subscription(SUB1/SUB2/SUB3) information
                  on which currently voice call is active(in foreground). -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4eee2370..72d1023f 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -117,7 +117,7 @@
     <!-- Default distance from each snap target that GlowPadView considers a "hit" -->
     <dimen name="glowpadview_inner_radius">15dip</dimen>
 
-    <dimen name="glowpadview_margin_bottom">-113dip</dimen>
+    <dimen name="glowpadview_margin_bottom">-48dip</dimen>
     <dimen name="glowpadview_margin_right">0dip</dimen>
 
     <!-- Text dimensions for dialpad keys -->