Compact contact editor UI tweaks

* Move delete ActionBar icon option back into the overflow
* Move the "More fields" option back to left alignment and
  give it accent color
* Make unfocused fields 25% black
* Layout/padding tweaks
  - Remove the 0 bottom padding on names so that all fields
    have the same spacing between each other
  - Use the min edit height on the "More fields" row
    so that the spacing is the same as the other fields.

Bug 19729447

Change-Id: Ia11c74c1b65f96f937d6e51ed143f5f088b41561

10 files changed, 42 insertions, 47 deletions

diff --git a/res/drawable-hdpi/ic_delete_white_24dp.png b/res/drawable-hdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 4a9f76947..000000000
--- a/res/drawable-hdpi/ic_delete_white_24dp.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_delete_white_24dp.png b/res/drawable-mdpi/ic_delete_white_24dp.png
deleted file mode 100644
index e2f5f3555..000000000
--- a/res/drawable-mdpi/ic_delete_white_24dp.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_delete_white_24dp.png b/res/drawable-xhdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 388b5b060..000000000
--- a/res/drawable-xhdpi/ic_delete_white_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_delete_white_24dp.png b/res/drawable-xxhdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 3fcdfdb55..000000000
--- a/res/drawable-xxhdpi/ic_delete_white_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_delete_white_24dp.png b/res/drawable-xxxhdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 8d322aa9b..000000000
--- a/res/drawable-xxxhdpi/ic_delete_white_24dp.png
+++ /dev/null
diff --git a/res/layout-land/compact_contact_editor_fragment.xml b/res/layout-land/compact_contact_editor_fragment.xml
index ffc8f4f4d..23630911e 100644
--- a/res/layout-land/compact_contact_editor_fragment.xml
+++ b/res/layout-land/compact_contact_editor_fragment.xml
@@ -24,21 +24,7 @@
         android:orientation="horizontal"
         android:visibility="invisible">
 
-    <com.android.contacts.editor.CompactPhotoEditorView
-            android:id="@+id/photo_editor"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_horizontal"
-            android:orientation="vertical">
-
-        <com.android.contacts.widget.QuickContactImageView
-                android:id="@+id/photo"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clickable="true"
-                android:scaleType="centerCrop"/>
-
-    </com.android.contacts.editor.CompactPhotoEditorView>
+    <include layout="@layout/compact_photo_editor_view" />
 
     <ScrollView
             android:layout_width="match_parent"
diff --git a/res/layout/compact_contact_editor_fields.xml b/res/layout/compact_contact_editor_fields.xml
index 723c9529a..f59c5be30 100644
--- a/res/layout/compact_contact_editor_fields.xml
+++ b/res/layout/compact_contact_editor_fields.xml
@@ -60,28 +60,20 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-        <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/divider_line_height"
-                android:background="@color/divider_line_color_light"/>
-
+        <!-- See the comment for EditKindIconStyle in styles.xml, we use (16 + 24 + 32) dp of
+             padding (start margin + icon width + end margin) for this to line up with the start
+             of the edit fields. -->
         <TextView
+                android:background="?android:attr/selectableItemBackground"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingEnd="@dimen/expanding_entry_card_item_image_spacing"
+                android:minHeight="@dimen/editor_min_line_item_height"
+                android:paddingStart="72dp"
                 android:gravity="center_vertical"
-                android:paddingBottom="@dimen/expanding_entry_card_button_padding_vertical"
-                android:paddingTop="@dimen/expanding_entry_card_button_padding_vertical"
                 android:text="@string/compact_editor_more_fields"
-                android:textAlignment="viewEnd"
-                android:textColor="@color/expanding_entry_card_button_text_color"
+                android:textColor="?android:attr/colorAccent"
                 android:textSize="@dimen/expanding_entry_card_title_text_size"/>
 
-        <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/divider_line_height"
-                android:background="@color/divider_line_color_light"/>
-
     </LinearLayout>
 
 </merge>
\ No newline at end of file
diff --git a/res/layout/compact_contact_editor_fragment.xml b/res/layout/compact_contact_editor_fragment.xml
index d38184b44..a6cda4c2a 100644
--- a/res/layout/compact_contact_editor_fragment.xml
+++ b/res/layout/compact_contact_editor_fragment.xml
@@ -29,21 +29,7 @@
             android:orientation="vertical"
             android:visibility="invisible">
 
-        <com.android.contacts.editor.CompactPhotoEditorView
-                android:id="@+id/photo_editor"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center_horizontal"
-                android:orientation="vertical">
-
-            <com.android.contacts.widget.QuickContactImageView
-                    android:id="@+id/photo"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:clickable="true"
-                    android:scaleType="centerCrop"/>
-
-        </com.android.contacts.editor.CompactPhotoEditorView>
+        <include layout="@layout/compact_photo_editor_view" />
 
         <include layout="@layout/compact_contact_editor_fields" />
 
diff --git a/res/layout/compact_photo_editor_view.xml b/res/layout/compact_photo_editor_view.xml
new file mode 100644
index 000000000..670b24ee3
--- /dev/null
+++ b/res/layout/compact_photo_editor_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 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.
+-->
+
+<com.android.contacts.editor.CompactPhotoEditorView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/photo_editor"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_horizontal">
+
+    <com.android.contacts.widget.QuickContactImageView
+            android:id="@+id/photo"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"/>
+
+</com.android.contacts.editor.CompactPhotoEditorView>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index cb658b3cf..a537a9554 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -62,6 +62,6 @@
     <!-- Color of the mime-type icons inside the editor. 50% black. -->
     <color name="editor_icon_color">#7f7f7f</color>
 
-    <!-- Color of disabled text and unfocused hint text inside the contact editor. -->
-    <color name="editor_disabled_text_color">#989898</color>
+    <!-- Color of disabled text and unfocused hint text inside the contact editor. 25% black. -->
+    <color name="editor_disabled_text_color">#40000000</color>
 </resources>