Revert "InCallUI: fix non intrusive incallui layout"

This reverts commit b7a423a.

Author: codex-corp

res/layout/card_call_incoming.xml

@@ -25,63 +25,59 @@
 
         <TextView
             android:id="@+id/txt_contact_name"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_alignTop="@+id/img_contact"
+            android:layout_marginBottom="2dp"
             android:layout_marginLeft="8dp"
             android:layout_marginTop="2dp"
             android:layout_toRightOf="@+id/img_contact"
+            android:layout_weight="1"
             android:ellipsize="marquee"
             android:gravity="center_vertical"
             android:lines="1"
-            android:textColor="#333333"
-            android:layout_above="@+id/linearLayout"
+            android:textColor="@color/card_call_incoming_contact_name"
             android:textSize="24sp" />
 
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="fill_parent"
+        <TextView
+            android:id="@+id/separator"
+            android:layout_width="1dp"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_toRightOf="@+id/img_contact"
-            android:id="@+id/linearLayout"
-            android:layout_alignLeft="@+id/txt_contact_name"
-            android:gravity="center_vertical" >
-
-            <Button
-                android:id="@+id/btn_reject"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                style="@android:style/Widget.Holo.Button.Borderless"
-                android:drawableLeft="@drawable/ic_lockscreen_decline_normal"
-                android:text="@string/description_target_decline"
-                android:textColor="#000000"
-                android:textSize="13sp"
-                android:ellipsize="none" />
+            android:layout_alignBottom="@+id/btn_reject"
+            android:layout_alignTop="@+id/btn_reject"
+            android:layout_marginLeft="4dp"
+            android:layout_marginRight="4dp"
+            android:layout_toRightOf="@+id/btn_reject"
+            android:background="@color/card_call_incoming_separator"
+            android:maxWidth="1dp" />
 
-            <TextView
-                android:id="@+id/separator"
-                android:layout_width="1dp"
-                android:layout_height="fill_parent"
-                android:layout_marginLeft="4dp"
-                android:layout_marginRight="4dp"
-                android:background="#888888"
-                android:maxWidth="0dp" />
+        <Button
+            android:id="@+id/btn_answer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:layout_toRightOf="@+id/separator"
+            android:layout_marginLeft="4dp"
+            style="@*android:style/Widget.Holo.Button.Borderless"
+            android:drawableLeft="@drawable/ic_lockscreen_answer_normal"
+            android:text="@string/description_target_answer"
+            android:textColor="@color/card_call_incoming_answer_reject"
+            android:textSize="18sp" />
 
-            <Button
-                android:id="@+id/btn_answer"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                style="@android:style/Widget.Holo.Button.Borderless"
-                android:drawableLeft="@drawable/ic_lockscreen_answer_normal"
-                android:text="@string/description_target_answer"
-                android:textColor="#000000"
-                android:textSize="13sp"
-                android:ellipsize="none" />
-        </LinearLayout>
+        <Button
+            android:id="@+id/btn_reject"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_toRightOf="@+id/img_contact"
+            style="@*android:style/Widget.Holo.Button.Borderless"
+            android:drawableLeft="@drawable/ic_lockscreen_decline_normal"
+            android:text="@string/description_target_decline"
+            android:textColor="@color/card_call_incoming_answer_reject"
+            android:textSize="18sp" />
 
     </RelativeLayout>
+
 </LinearLayout>