commit d348a90b9bf7942642e3f1ed59153af416c12fc1
author Wenyi Wang <wenyiw@google.com> Sun Aug 14 12:56:06 2016 -0700
committer Wenyi Wang <wenyiw@google.com> Sun Aug 14 12:56:06 2016 -0700
tree 620937994eabdc433950a724bb0a1e1d30cc339c
parent 8df90ee4aa8ef020f0c7f93472fcf2ac9b058a71

Modify name text bound if delete button is visible

* RTL is also handled.

Bug 30288998

Change-Id: I458fe0a44722b1ad14b1216dfe3d15c34d036a1b

src/com/android/contacts/activities/ActionBarAdapter.java

diff --git a/src/com/android/contacts/activities/ActionBarAdapter.java b/src/com/android/contacts/activities/ActionBarAdapter.java
index e78c355..b896406 100644
--- a/src/com/android/contacts/activities/ActionBarAdapter.java
+++ b/src/com/android/contacts/activities/ActionBarAdapter.java
@@ -604,7 +604,7 @@
         }
 
         if (mSelectionMode) {
-            final int cabStatusBarColor =ContextCompat.getColor(
+            final int cabStatusBarColor = ContextCompat.getColor(
                     mActivity, R.color.contextual_selection_bar_status_bar_color);
             runStatusBarAnimation(/* colorTo */ cabStatusBarColor);
         } else {

src/com/android/contacts/common/list/ContactListItemView.java

diff --git a/src/com/android/contacts/common/list/ContactListItemView.java b/src/com/android/contacts/common/list/ContactListItemView.java
index bb28858..1dc99ef 100644
--- a/src/com/android/contacts/common/list/ContactListItemView.java
+++ b/src/com/android/contacts/common/list/ContactListItemView.java
@@ -674,11 +674,13 @@
                         photoTop,
                         rightBound,
                         photoTop + mDeleteImageButtonSize);
+                rightBound -= mDeleteImageButtonSize;
             } else {
                 mDeleteImageButton.layout(leftBound,
                         photoTop,
                         leftBound + mDeleteImageButtonSize,
                         photoTop + mDeleteImageButtonSize);
+                leftBound += mDeleteImageButtonSize;
             }
         }