Remove vertical and colored bars from editors.

Fixes http://b/2186076

diff --git a/res/layout/item_contact_editor.xml b/res/layout/item_contact_editor.xml
index 76f063e..a7d5df5 100644 (file)
--- a/res/layout/item_contact_editor.xml
+++ b/res/layout/item_contact_editor.xml
@@ -27,6 +27,7 @@
         android:id="@+id/color_bar"
         android:layout_width="4dip"
         android:layout_height="fill_parent"
+        android:visibility="gone"
     />
 
     <!-- The content -->
@@ -45,8 +46,9 @@
 
             <ImageView android:id="@+id/header_color_bar"
                 android:layout_width="fill_parent"
-                android:layout_height="2dip"
+                android:layout_height="4dip"
                 android:layout_marginBottom="5dip"
+                android:background="@color/edit_divider"
             />
 
             <ImageView android:id="@+id/header_icon"

diff --git a/res/layout/item_read_only_contact_editor.xml b/res/layout/item_read_only_contact_editor.xml
index 370093c..0b1dc14 100644 (file)
--- a/res/layout/item_read_only_contact_editor.xml
+++ b/res/layout/item_read_only_contact_editor.xml
@@ -27,6 +27,7 @@
         android:id="@+id/color_bar"
         android:layout_width="4dip"
         android:layout_height="fill_parent"
+        android:visibility="gone"
     />
 
     <!-- The content -->
@@ -45,8 +46,9 @@
 
             <ImageView android:id="@+id/header_color_bar"
                 android:layout_width="fill_parent"
-                android:layout_height="2dip"
+                android:layout_height="4dip"
                 android:layout_marginBottom="5dip"
+                android:background="@color/edit_divider"
             />
 
             <ImageView android:id="@+id/header_icon"

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 880c269..69ab865 100644 (file)
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -20,4 +20,6 @@
     <color name="sect_secondary">#4fff</color>
     <color name="quickcontact_disambig">#f2f2f2</color>
     <color name="quickcontact_disambig_divider">#afafaf</color>
+
+    <color name="edit_divider">#ff666666</color>
 </resources>

diff --git a/src/com/android/contacts/ui/widget/ContactEditorView.java b/src/com/android/contacts/ui/widget/ContactEditorView.java
index d266edf..1720822 100644 (file)
--- a/src/com/android/contacts/ui/widget/ContactEditorView.java
+++ b/src/com/android/contacts/ui/widget/ContactEditorView.java
@@ -161,8 +161,6 @@ public class ContactEditorView extends BaseContactEditorView implements OnClickL
         EntityModifier.ensureKindExists(state, source, StructuredName.CONTENT_ITEM_TYPE);
 
         // Fill in the header info
-        mHeaderColorBar.setBackgroundColor(source.getHeaderColor(mContext));
-        mSideBar.setBackgroundColor(source.getSideBarColor(mContext));
         ValuesDelta values = state.getValues();
         String accountName = values.getAsString(RawContacts.ACCOUNT_NAME);
         CharSequence accountType = source.getDisplayLabel(mContext);

diff --git a/src/com/android/contacts/ui/widget/ReadOnlyContactEditorView.java b/src/com/android/contacts/ui/widget/ReadOnlyContactEditorView.java
index 745b061..a5f8eb6 100644 (file)
--- a/src/com/android/contacts/ui/widget/ReadOnlyContactEditorView.java
+++ b/src/com/android/contacts/ui/widget/ReadOnlyContactEditorView.java
@@ -112,8 +112,6 @@ class ReadOnlyContactEditorView extends BaseContactEditorView {
         EntityModifier.ensureKindExists(state, source, StructuredName.CONTENT_ITEM_TYPE);
 
         // Fill in the header info
-        mHeaderColorBar.setBackgroundColor(source.getHeaderColor(mContext));
-        mSideBar.setBackgroundColor(source.getSideBarColor(mContext));
         ValuesDelta values = state.getValues();
         String accountName = values.getAsString(RawContacts.ACCOUNT_NAME);
         CharSequence accountType = source.getDisplayLabel(mContext);