From 5ec23fdf243596717197a0c45495f24492cf0641 Mon Sep 17 00:00:00 2001
From: Paul Soulos <psoulos@google.com>
Date: Thu, 29 May 2014 18:19:38 -0700
Subject: Makes QuickContactActivity full screen and swaps full detail for
 edit.

Change-Id: I9403a592ba916bcb627e023736d133b6b33a1420
---
 res/layout/quickcontact_activity.xml        |  3 ++-
 res/layout/quickcontact_photo_container.xml | 10 +++++-----
 res/values/colors.xml                       |  2 ++
 res/values/strings.xml                      |  4 ----
 res/values/styles.xml                       |  7 -------
 5 files changed, 9 insertions(+), 17 deletions(-)

(limited to 'res')

diff --git a/res/layout/quickcontact_activity.xml b/res/layout/quickcontact_activity.xml
index 3aa0a1426..f4bf72b8d 100644
--- a/res/layout/quickcontact_activity.xml
+++ b/res/layout/quickcontact_activity.xml
@@ -21,7 +21,8 @@
     android:orientation="vertical"
     android:focusable="true"
     android:focusableInTouchMode="true"
-    android:descendantFocusability="afterDescendants" >
+    android:descendantFocusability="afterDescendants"
+    android:background="@color/card_margin_color" >
 
     <LinearLayout
         android:id="@android:id/content"
diff --git a/res/layout/quickcontact_photo_container.xml b/res/layout/quickcontact_photo_container.xml
index 723665f31..629ee50e7 100644
--- a/res/layout/quickcontact_photo_container.xml
+++ b/res/layout/quickcontact_photo_container.xml
@@ -43,8 +43,8 @@
             android:layout_alignEnd="@id/photo"
             android:background="@color/quickcontact_name_detail_background" />
         <ImageView
-            android:id="@+id/contact_details_image"
-            android:src="@drawable/ic_contacts_holo_dark"
+            android:id="@+id/contact_edit_image"
+            android:src="@drawable/ic_menu_compose_holo_dark"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:layout_marginRight="16dip"
@@ -54,7 +54,7 @@
             android:layout_alignRight="@id/photo_text_bar"
             android:layout_alignEnd="@id/photo_text_bar"
             android:clickable="true"
-            android:contentDescription="@string/viewContactDesription" />
+            android:contentDescription="@string/editContactDescription" />
         <ImageView
             android:id="@+id/quickcontact_star_button"
             android:src="@drawable/ic_favorite_off_lt"
@@ -64,8 +64,8 @@
             android:layout_marginRight="16dip"
             android:layout_marginEnd="16dip"
             android:layout_alignBottom="@id/photo_text_bar"
-            android:layout_toLeftOf="@id/contact_details_image"
-            android:layout_toStartOf="@id/contact_details_image"
+            android:layout_toLeftOf="@id/contact_edit_image"
+            android:layout_toStartOf="@id/contact_edit_image"
             android:clickable="true"
             android:contentDescription="@string/menu_addStar" />
         <TextView
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e53dc41eb..cc1d9b036 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -45,4 +45,6 @@
     <!-- Color of the text on an ExpandingEntryCard button -->
     <color name="expanding_entry_card_button_text_color">@android:color/black</color>
 
+    <!-- Color of the margin for cards -->
+    <color name="card_margin_color">#ffbbbbbb</color>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6c368f541..cf4903511 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -59,10 +59,6 @@
     <!-- The title bar when viewing the contact details activity -->
     <string name="viewContactTitle">Contact details</string>
 
-    <!-- The description presented to the user in the Intent choose when there are multiple activities that allow
-         viewing a contact. This string represents the built in way to view the contact. -->
-    <string name="viewContactDesription">View contact</string>
-
     <!-- The description presented to the user in the Intent choose when there are multiple activities that allow
          editing a contact. This string represents the built in way to edit the contact. -->
     <string name="editContactDescription">Edit contact</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5ec06a88b..36c6b1199 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -42,13 +42,6 @@
     </style>
 
     <style name="Theme.QuickContact" parent="@android:style/Theme.Quantum.Light">
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowAnimationStyle">@null</item>
-        <item name="android:windowIsFloating">false</item>
-        <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:listViewStyle">@style/ListViewStyle</item>
     </style>
-- 
cgit v1.2.3