Makes QuickContactActivity full screen and swaps full detail for edit.

Change-Id: I9403a592ba916bcb627e023736d133b6b33a1420

6 files changed, 21 insertions, 29 deletions

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
@@ -60,10 +60,6 @@
     <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>
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 861cb6690..d2620c5e1 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -115,7 +115,7 @@ public class QuickContactActivity extends Activity {
     private View mPhotoContainer;
 
     private ImageView mPhotoView;
-    private ImageView mOpenDetailsOrAddContactImage;
+    private ImageView mEditOrAddContactImage;
     private ImageView mStarImage;
     private ExpandingEntryCardView mCommunicationCard;
 
@@ -160,10 +160,10 @@ public class QuickContactActivity extends Activity {
     private StopWatch mStopWatch = ENABLE_STOPWATCH
             ? StopWatch.start("QuickContact") : StopWatch.getNullStopWatch();
 
-    final OnClickListener mOpenDetailsClickHandler = new OnClickListener() {
+    final OnClickListener mEditContactClickHandler = new OnClickListener() {
         @Override
         public void onClick(View v) {
-            final Intent intent = new Intent(Intent.ACTION_VIEW, mLookupUri);
+            final Intent intent = new Intent(Intent.ACTION_EDIT, mLookupUri);
             mContactLoader.cacheResult();
             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
             startActivity(intent);
@@ -242,12 +242,12 @@ public class QuickContactActivity extends Activity {
 
         mStopWatch.lap("l"); // layout inflated
 
-        mOpenDetailsOrAddContactImage = (ImageView) findViewById(R.id.contact_details_image);
+        mEditOrAddContactImage = (ImageView) findViewById(R.id.contact_edit_image);
         mStarImage = (ImageView) findViewById(R.id.quickcontact_star_button);
         mCommunicationCard = (ExpandingEntryCardView) findViewById(R.id.communication_card);
         mCommunicationCard.setTitle(getResources().getString(R.string.communication_card_title));
 
-        mOpenDetailsOrAddContactImage.setOnClickListener(mOpenDetailsClickHandler);
+        mEditOrAddContactImage.setOnClickListener(mEditContactClickHandler);
         mCommunicationCard.setOnClickListener(mEntryClickHandler);
 
         // find and prepare correct header view
@@ -256,7 +256,7 @@ public class QuickContactActivity extends Activity {
         setHeaderNameText(R.id.name, R.string.missing_name);
 
         mPhotoView = (ImageView) mPhotoContainer.findViewById(R.id.photo);
-        mPhotoView.setOnClickListener(mOpenDetailsClickHandler);
+        mPhotoView.setOnClickListener(mEditContactClickHandler);
 
         mStopWatch.lap("v"); // view initialized
 
@@ -308,7 +308,7 @@ public class QuickContactActivity extends Activity {
         final ResolveCache cache = ResolveCache.getInstance(this);
         final Context context = this;
 
-        mOpenDetailsOrAddContactImage.setVisibility(isMimeExcluded(Contacts.CONTENT_ITEM_TYPE) ?
+        mEditOrAddContactImage.setVisibility(isMimeExcluded(Contacts.CONTENT_ITEM_TYPE) ?
                 View.GONE : View.VISIBLE);
         final boolean isStarred = data.getStarred();
         if (isStarred) {
@@ -483,13 +483,13 @@ public class QuickContactActivity extends Activity {
      */
     private void configureHeaderClickActions(boolean canAdd) {
         if (canAdd) {
-            mOpenDetailsOrAddContactImage.setImageResource(R.drawable.ic_add_contact_holo_dark);
-            mOpenDetailsOrAddContactImage.setOnClickListener(mAddToContactsClickHandler);
+            mEditOrAddContactImage.setImageResource(R.drawable.ic_add_contact_holo_dark);
+            mEditOrAddContactImage.setOnClickListener(mAddToContactsClickHandler);
             mPhotoView.setOnClickListener(mAddToContactsClickHandler);
         } else {
-            mOpenDetailsOrAddContactImage.setImageResource(R.drawable.ic_contacts_holo_dark);
-            mOpenDetailsOrAddContactImage.setOnClickListener(mOpenDetailsClickHandler);
-            mPhotoView.setOnClickListener(mOpenDetailsClickHandler);
+            mEditOrAddContactImage.setImageResource(R.drawable.ic_menu_compose_holo_dark);
+            mEditOrAddContactImage.setOnClickListener(mEditContactClickHandler);
+            mPhotoView.setOnClickListener(mEditContactClickHandler);
         }
     }