commit d8e0049c4c05a55b41566e3f53d38e877a8d71d2
author Dave Santoro <dsantoro@google.com> Mon Apr 25 15:56:42 2011 -0700
committer Dave Santoro <dsantoro@google.com> Mon Apr 25 15:56:42 2011 -0700
tree 7c986023a29acf6534bfdc097a97be9797b5d0b3
parent cf9e85fd2c58c80f609e63326715b386f26983f0

Move the more-or-less button if needed.

For Exchange contacts, the more-or-less button for the address field would
overlap the delete button, making it impossible to specify a country.  This
changes that logic to shunt down the move-or-less button if delete is present.

Bug 4195633.

Change-Id: I52c5be56ed51baa010026b710815f0fbfdbd9ebf

src/com/android/contacts/editor/TextFieldsEditorView.java

diff --git a/src/com/android/contacts/editor/TextFieldsEditorView.java b/src/com/android/contacts/editor/TextFieldsEditorView.java
index 3187eaa..9a44cce 100644
--- a/src/com/android/contacts/editor/TextFieldsEditorView.java
+++ b/src/com/android/contacts/editor/TextFieldsEditorView.java
@@ -102,9 +102,14 @@
         int r1 = getMeasuredWidth() - getPaddingRight();
 
         if ((mMoreOrLess != null)) {
+            // Ensure that the more-or-less button does not overlap the delete button.
+            int moreOrLessTop = t1;
+            if (getDelete() != null) {
+                moreOrLessTop = getDelete().getBottom() + getPaddingTop();
+            }
             mMoreOrLess.layout(
-                    r1 - mMoreOrLess.getMeasuredWidth(), t1,
-                    r1, t1 + mMoreOrLess.getMeasuredHeight());
+                    r1 - mMoreOrLess.getMeasuredWidth(), moreOrLessTop,
+                    r1, moreOrLessTop + mMoreOrLess.getMeasuredHeight());
         }
 
         // Subtract buttons if necessary