Merge tag 'android-4.4.1_r1' into HEADcm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315ea

Android 4.4.1 Release 1

4 files changed, 22 insertions, 0 deletions

diff --git a/chips/src/com/android/ex/chips/recipientchip/BaseRecipientChip.java b/chips/src/com/android/ex/chips/recipientchip/BaseRecipientChip.java
index a080ee7..032d3b2 100644
--- a/chips/src/com/android/ex/chips/recipientchip/BaseRecipientChip.java
+++ b/chips/src/com/android/ex/chips/recipientchip/BaseRecipientChip.java
@@ -70,4 +70,11 @@ interface BaseRecipientChip {
      * before any reverse lookups.
      */
     CharSequence getOriginalText();
+
+    /**
+     * Checks if this contact was retrieved from a GAL lookup.
+     *
+     * @return <code>true</code> if it came from GAL, <code>false</code> otherwise
+     */
+    boolean isGalContact();
 }
diff --git a/chips/src/com/android/ex/chips/recipientchip/InvisibleRecipientChip.java b/chips/src/com/android/ex/chips/recipientchip/InvisibleRecipientChip.java
index 0380a81..11a66da 100644
--- a/chips/src/com/android/ex/chips/recipientchip/InvisibleRecipientChip.java
+++ b/chips/src/com/android/ex/chips/recipientchip/InvisibleRecipientChip.java
@@ -82,6 +82,11 @@ public class InvisibleRecipientChip extends ReplacementSpan implements DrawableR
     }
 
     @Override
+    public boolean isGalContact() {
+        return mDelegate.isGalContact();
+    }
+
+    @Override
     public void draw(final Canvas canvas, final CharSequence text, final int start, final int end,
             final float x, final int top, final int y, final int bottom, final Paint paint) {
         // Do nothing.
diff --git a/chips/src/com/android/ex/chips/recipientchip/SimpleRecipientChip.java b/chips/src/com/android/ex/chips/recipientchip/SimpleRecipientChip.java
index c04b3be..ac8e897 100644
--- a/chips/src/com/android/ex/chips/recipientchip/SimpleRecipientChip.java
+++ b/chips/src/com/android/ex/chips/recipientchip/SimpleRecipientChip.java
@@ -93,6 +93,11 @@ class SimpleRecipientChip implements BaseRecipientChip {
     }
 
     @Override
+    public boolean isGalContact() {
+        return mEntry.isGalContact();
+    }
+
+    @Override
     public String toString() {
         return mDisplay + " <" + mValue + ">";
     }
diff --git a/chips/src/com/android/ex/chips/recipientchip/VisibleRecipientChip.java b/chips/src/com/android/ex/chips/recipientchip/VisibleRecipientChip.java
index acade7f..4637f69 100644
--- a/chips/src/com/android/ex/chips/recipientchip/VisibleRecipientChip.java
+++ b/chips/src/com/android/ex/chips/recipientchip/VisibleRecipientChip.java
@@ -83,6 +83,11 @@ public class VisibleRecipientChip extends ImageSpan implements DrawableRecipient
     }
 
     @Override
+    public boolean isGalContact() {
+        return mDelegate.isGalContact();
+    }
+
+    @Override
     public Rect getBounds() {
         return getDrawable().getBounds();
     }