commit cbe965d52e5b923f57fe6a7303eb25943a429743
author Wenyi Wang <wenyiw@google.com> Fri Nov 13 20:19:34 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 13 20:19:34 2015 +0000
tree c161d44a101d2b43f2f987c86fe7e6d4d41a7010
parent d72f45f24940b0162d07e4551a6b63bd15d4472a
parent c3e1e75bcad5df47a96af965e20ae76b5a58f200

Merge "Show delete button only when text is not empty" into ub-contactsdialer-a-dev am: df864c7808
am: c3e1e75bca

* commit 'c3e1e75bcad5df47a96af965e20ae76b5a58f200':
  Show delete button only when text is not empty

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 8a6141d..98b46ef 100644
--- a/src/com/android/contacts/editor/TextFieldsEditorView.java
+++ b/src/com/android/contacts/editor/TextFieldsEditorView.java
@@ -260,8 +260,8 @@
                 fieldView.setText(value);
             }
 
-            // Show the delete button if we have a non-null value
-            setDeleteButtonVisible(value != null);
+            // Show the delete button if we have a non-empty value
+            setDeleteButtonVisible(!TextUtils.isEmpty(value));
 
             // Prepare listener for writing changes
             fieldView.addTextChangedListener(new TextWatcher() {