summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-12-06 02:16:40 (GMT)
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-12-06 02:16:40 (GMT)
commitaecf604ef14f07e078c309b015c2333e22640789 (patch)
tree3015ce491d513fb452665aa7f093138599800a20
parent0ab100671fdff8675ea1f74f15627f09c7f7506f (diff)
parent3e8176df16950c067bcb1b37e62b2fc07d74065a (diff)
downloadandroid_frameworks_ex-cm-11.0-XNPH25R-bacon-d22b777afa.zip
android_frameworks_ex-cm-11.0-XNPH25R-bacon-d22b777afa.tar.gz
android_frameworks_ex-cm-11.0-XNPH25R-bacon-d22b777afa.tar.bz2
Android 4.4.1 Release 1
-rw-r--r--camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java76
-rw-r--r--camera2/public/src/com/android/ex/camera2/utils/SysTrace.java121
-rw-r--r--chips/src/com/android/ex/chips/BaseRecipientAdapter.java22
-rw-r--r--chips/src/com/android/ex/chips/RecipientAlternatesAdapter.java6
-rw-r--r--chips/src/com/android/ex/chips/RecipientEditTextView.java3
-rw-r--r--chips/src/com/android/ex/chips/RecipientEntry.java28
-rw-r--r--chips/src/com/android/ex/chips/recipientchip/BaseRecipientChip.java7
-rw-r--r--chips/src/com/android/ex/chips/recipientchip/InvisibleRecipientChip.java5
-rw-r--r--chips/src/com/android/ex/chips/recipientchip/SimpleRecipientChip.java5
-rw-r--r--chips/src/com/android/ex/chips/recipientchip/VisibleRecipientChip.java5
-rw-r--r--chips/tests/src/com/android/ex/chips/RecipientAlternatesAdapterTest.java14
11 files changed, 267 insertions, 25 deletions
diff --git a/camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java b/camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
index 5b11c2b..500fb12 100644
--- a/camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
+++ b/camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
@@ -21,6 +21,8 @@ import android.hardware.camera2.CaptureRequest;
import android.hardware.camera2.CaptureResult;
import android.util.Log;
+import com.android.ex.camera2.utils.SysTrace;
+
/**
* Manage the auto focus state machine for CameraDevice.
*
@@ -29,6 +31,10 @@ import android.util.Log;
*/
public class AutoFocusStateMachine {
+ /**
+ * Observe state AF state transitions triggered by
+ * {@link AutoFocusStateMachine#onCaptureCompleted onCaptureCompleted}.
+ */
public interface AutoFocusStateListener {
/**
* The camera is currently focused (either active or passive).
@@ -72,6 +78,10 @@ public class AutoFocusStateMachine {
private int mCurrentAfMode = AF_UNINITIALIZED;
private int mCurrentAfTrigger = AF_UNINITIALIZED;
+ private int mCurrentAfCookie = AF_UNINITIALIZED;
+ private String mCurrentAfTrace = "";
+ private int mLastAfCookie = 0;
+
public AutoFocusStateMachine(AutoFocusStateListener listener) {
if (listener == null) {
throw new IllegalArgumentException("listener should not be null");
@@ -146,9 +156,11 @@ public class AutoFocusStateMachine {
switch (afState) {
case CaptureResult.CONTROL_AF_STATE_FOCUSED_LOCKED:
mListener.onAutoFocusSuccess(result, /*locked*/true);
+ endTraceAsync();
break;
case CaptureResult.CONTROL_AF_STATE_NOT_FOCUSED_LOCKED:
mListener.onAutoFocusFail(result, /*locked*/true);
+ endTraceAsync();
break;
case CaptureResult.CONTROL_AF_STATE_PASSIVE_FOCUSED:
mListener.onAutoFocusSuccess(result, /*locked*/false);
@@ -169,6 +181,22 @@ public class AutoFocusStateMachine {
}
/**
+ * Reset the current AF state.
+ *
+ * <p>
+ * When dropping capture results (by not invoking {@link #onCaptureCompleted} when a new
+ * {@link CaptureResult} is available), call this function to reset the state. Otherwise
+ * the next time a new state is observed this class may incorrectly consider it as the same
+ * state as before, and not issue any callbacks by {@link AutoFocusStateListener}.
+ * </p>
+ */
+ public synchronized void resetState() {
+ if (VERBOSE_LOGGING) Log.v(TAG, "resetState - last state was " + mLastAfState);
+
+ mLastAfState = AF_UNINITIALIZED;
+ }
+
+ /**
* Lock the lens from moving. Typically used before taking a picture.
*
* <p>After calling this function, submit the new requestBuilder as a separate capture.
@@ -195,6 +223,8 @@ public class AutoFocusStateMachine {
throw new IllegalStateException("AF mode was not enabled");
}
+ beginTraceAsync("AFSM_lockAutoFocus");
+
mCurrentAfTrigger = CaptureRequest.CONTROL_AF_TRIGGER_START;
repeatingBuilder.set(CaptureRequest.CONTROL_AF_MODE, mCurrentAfMode);
@@ -275,6 +305,8 @@ public class AutoFocusStateMachine {
CaptureRequest.Builder requestBuilder) {
if (VERBOSE_LOGGING) Log.v(TAG, "setActiveAutoFocus");
+ beginTraceAsync("AFSM_setActiveAutoFocus");
+
mCurrentAfMode = CaptureRequest.CONTROL_AF_MODE_AUTO;
repeatingBuilder.set(CaptureRequest.CONTROL_AF_MODE, mCurrentAfMode);
@@ -311,4 +343,48 @@ public class AutoFocusStateMachine {
repeatingBuilder.set(CaptureRequest.CONTROL_AF_MODE, mCurrentAfMode);
}
+
+ private synchronized void beginTraceAsync(String sectionName) {
+ if (mCurrentAfCookie != AF_UNINITIALIZED) {
+ // Terminate any currently active async sections before beginning another section
+ SysTrace.endSectionAsync(mCurrentAfTrace, mCurrentAfCookie);
+ }
+
+ mLastAfCookie++;
+ mCurrentAfCookie = mLastAfCookie;
+ mCurrentAfTrace = sectionName;
+
+ SysTrace.beginSectionAsync(sectionName, mCurrentAfCookie);
+ }
+
+ private synchronized void endTraceAsync() {
+ if (mCurrentAfCookie == AF_UNINITIALIZED) {
+ Log.w(TAG, "endTraceAsync - no current trace active");
+ return;
+ }
+
+ SysTrace.endSectionAsync(mCurrentAfTrace, mCurrentAfCookie);
+ mCurrentAfCookie = AF_UNINITIALIZED;
+ }
+
+ /**
+ * Update the repeating request with current focus mode.
+ *
+ * <p>This is typically used when a new repeating request is created to update preview with
+ * new metadata (i.e. crop region). The current auto focus mode needs to be carried over for
+ * correct auto focus behavior.<p>
+ *
+ * @param repeatingBuilder Builder for a repeating request.
+ */
+ public synchronized void updateCaptureRequest(CaptureRequest.Builder repeatingBuilder) {
+ if (repeatingBuilder == null) {
+ throw new IllegalArgumentException("repeatingBuilder shouldn't be null");
+ }
+
+ if (mCurrentAfMode == AF_UNINITIALIZED) {
+ throw new IllegalStateException("AF mode was not enabled");
+ }
+
+ repeatingBuilder.set(CaptureRequest.CONTROL_AF_MODE, mCurrentAfMode);
+ }
}
diff --git a/camera2/public/src/com/android/ex/camera2/utils/SysTrace.java b/camera2/public/src/com/android/ex/camera2/utils/SysTrace.java
new file mode 100644
index 0000000..fd92216
--- /dev/null
+++ b/camera2/public/src/com/android/ex/camera2/utils/SysTrace.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.ex.camera2.utils;
+
+import android.util.Log;
+
+/**
+ * Writes trace events to the system trace buffer. These trace events can be
+ * collected and visualized using the Systrace tool.
+ *
+ * <p>
+ * This tracing mechanism is independent of the method tracing mechanism
+ * offered by {@link Debug#startMethodTracing}. In particular, it enables
+ * tracing of events that occur across multiple processes.
+ * </p>
+ *
+ * <p>
+ * All traces are written using the <pre>APP</pre> tag.
+ * </p>
+ */
+public final class SysTrace {
+
+ private static final String TAG = "SysTrace";
+ private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);
+
+ private static int sNestingLevel = 0;
+
+ /**
+ * Writes trace message to indicate the value of a given counter.
+ *
+ * @param counterName The counter name to appear in the trace.
+ * @param counterValue The counter value.
+ *
+ */
+ public static void traceCounter(String counterName, int counterValue) {
+ if (VERBOSE) {
+ Log.v(TAG, "traceCounter " + counterName + " " + counterValue);
+ }
+ }
+
+ /**
+ * Writes a trace message to indicate that a given section of code has begun. This call must
+ * be followed by a corresponding call to {@link #endSection()} on the same thread.
+ *
+ * <p class="note"> At this time the vertical bar character '|', newline character '\n', and
+ * null character '\0' are used internally by the tracing mechanism. If sectionName contains
+ * these characters they will be replaced with a space character in the trace.
+ *
+ * @param sectionName The name of the code section to appear in the trace. This may be at
+ * most 127 Unicode code units long.
+ */
+ public static void beginSection(String sectionName) {
+ if (VERBOSE) {
+ Log.v(TAG, String.format("beginSection[%d] %s", sNestingLevel, sectionName));
+ sNestingLevel++;
+ }
+ }
+
+ /**
+ * Writes a trace message to indicate that a given section of code has
+ * ended.
+ * <p>
+ * This call must be preceded by a corresponding call to
+ * {@link #beginSection(String)}. Calling this method will mark the end of
+ * the most recently begun section of code, so care must be taken to ensure
+ * that beginSection / endSection pairs are properly nested and called from
+ * the same thread.
+ * </p>
+ */
+ public static void endSection() {
+ if (VERBOSE) {
+ sNestingLevel--;
+ Log.v(TAG, String.format("endSection[%d]", sNestingLevel));
+ }
+ }
+
+ /**
+ * Writes a trace message to indicate that a given section of code has
+ * begun.
+ *
+ * <p>Must be followed by a call to {@link #endSectionAsync} using the same
+ * tag. Unlike {@link #beginSection} and {@link #endSection},
+ * asynchronous events do not need to be nested. The name and cookie used to
+ * begin an event must be used to end it.</p>
+ *
+ * @param methodName The method name to appear in the trace.
+ * @param cookie Unique identifier for distinguishing simultaneous events
+ */
+ public static void beginSectionAsync(String methodName, int cookie) {
+ if (VERBOSE) {
+ Log.v(TAG, "beginSectionAsync " + methodName + " " + cookie);
+ }
+ }
+
+ /**
+ * Writes a trace message to indicate that the current method has ended.
+ * Must be called exactly once for each call to {@link #beginSectionAsync}
+ * using the same tag, name and cookie.
+ *
+ * @param methodName The method name to appear in the trace.
+ * @param cookie Unique identifier for distinguishing simultaneous events
+ */
+ public static void endSectionAsync(String methodName, int cookie) {
+ if (VERBOSE) {
+ Log.v(TAG, "endSectionAsync " + methodName + " " + cookie);
+ }
+ }
+}
diff --git a/chips/src/com/android/ex/chips/BaseRecipientAdapter.java b/chips/src/com/android/ex/chips/BaseRecipientAdapter.java
index d9eb64e..cdab4f3 100644
--- a/chips/src/com/android/ex/chips/BaseRecipientAdapter.java
+++ b/chips/src/com/android/ex/chips/BaseRecipientAdapter.java
@@ -152,6 +152,7 @@ public abstract class BaseRecipientAdapter extends BaseAdapter implements Filter
public final long dataId;
public final String thumbnailUriString;
public final int displayNameSource;
+ public final boolean isGalContact;
public TemporaryEntry(
String displayName,
@@ -161,7 +162,8 @@ public abstract class BaseRecipientAdapter extends BaseAdapter implements Filter
long contactId,
long dataId,
String thumbnailUriString,
- int displayNameSource) {
+ int displayNameSource,
+ boolean isGalContact) {
this.displayName = displayName;
this.destination = destination;
this.destinationType = destinationType;
@@ -170,9 +172,10 @@ public abstract class BaseRecipientAdapter extends BaseAdapter implements Filter
this.dataId = dataId;
this.thumbnailUriString = thumbnailUriString;
this.displayNameSource = displayNameSource;
+ this.isGalContact = isGalContact;
}
- public TemporaryEntry(Cursor cursor) {
+ public TemporaryEntry(Cursor cursor, boolean isGalContact) {
this.displayName = cursor.getString(Queries.Query.NAME);
this.destination = cursor.getString(Queries.Query.DESTINATION);
this.destinationType = cursor.getInt(Queries.Query.DESTINATION_TYPE);
@@ -181,6 +184,7 @@ public abstract class BaseRecipientAdapter extends BaseAdapter implements Filter
this.dataId = cursor.getLong(Queries.Query.DATA_ID);
this.thumbnailUriString = cursor.getString(Queries.Query.PHOTO_THUMBNAIL_URI);
this.displayNameSource = cursor.getInt(Queries.Query.DISPLAY_NAME_SOURCE);
+ this.isGalContact = isGalContact;
}
}
@@ -251,7 +255,8 @@ public abstract class BaseRecipientAdapter extends BaseAdapter implements Filter
while (defaultDirectoryCursor.moveToNext()) {
// Note: At this point each entry doesn't contain any photo
// (thus getPhotoBytes() returns null).
- putOneEntry(new TemporaryEntry(defaultDirectoryCursor),
+ putOneEntry(new TemporaryEntry(defaultDirectoryCursor,
+ false /* isGalContact */),
true, entryMap, nonAggregatedEntries, existingDestinations);
}
@@ -382,7 +387,7 @@ public abstract class BaseRecipientAdapter extends BaseAdapter implements Filter
if (cursor != null) {
while (cursor.moveToNext()) {
- tempEntries.add(new TemporaryEntry(cursor));
+ tempEntries.add(new TemporaryEntry(cursor, true /* isGalContact */));
}
}
} finally {
@@ -683,7 +688,8 @@ public abstract class BaseRecipientAdapter extends BaseAdapter implements Filter
entry.displayName,
entry.displayNameSource,
entry.destination, entry.destinationType, entry.destinationLabel,
- entry.contactId, entry.dataId, entry.thumbnailUriString, true));
+ entry.contactId, entry.dataId, entry.thumbnailUriString, true,
+ entry.isGalContact));
} else if (entryMap.containsKey(entry.contactId)) {
// We already have a section for the person.
final List<RecipientEntry> entryList = entryMap.get(entry.contactId);
@@ -691,14 +697,16 @@ public abstract class BaseRecipientAdapter extends BaseAdapter implements Filter
entry.displayName,
entry.displayNameSource,
entry.destination, entry.destinationType, entry.destinationLabel,
- entry.contactId, entry.dataId, entry.thumbnailUriString, true));
+ entry.contactId, entry.dataId, entry.thumbnailUriString, true,
+ entry.isGalContact));
} else {
final List<RecipientEntry> entryList = new ArrayList<RecipientEntry>();
entryList.add(RecipientEntry.constructTopLevelEntry(
entry.displayName,
entry.displayNameSource,
entry.destination, entry.destinationType, entry.destinationLabel,
- entry.contactId, entry.dataId, entry.thumbnailUriString, true));
+ entry.contactId, entry.dataId, entry.thumbnailUriString, true,
+ entry.isGalContact));
entryMap.put(entry.contactId, entryList);
}
}
diff --git a/chips/src/com/android/ex/chips/RecipientAlternatesAdapter.java b/chips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
index f64c166..b9a7c80 100644
--- a/chips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
+++ b/chips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
@@ -229,7 +229,8 @@ public class RecipientAlternatesAdapter extends CursorAdapter {
c.getLong(Queries.Query.CONTACT_ID),
c.getLong(Queries.Query.DATA_ID),
c.getString(Queries.Query.PHOTO_THUMBNAIL_URI),
- true);
+ true,
+ false /* isGalContact TODO(skennedy) We should look these up eventually */);
/*
* In certain situations, we may have two results for one address, where one of the
@@ -429,7 +430,8 @@ public class RecipientAlternatesAdapter extends CursorAdapter {
c.getLong(Queries.Query.CONTACT_ID),
c.getLong(Queries.Query.DATA_ID),
c.getString(Queries.Query.PHOTO_THUMBNAIL_URI),
- true);
+ true,
+ false /* isGalContact TODO(skennedy) We should look these up eventually */);
}
@Override
diff --git a/chips/src/com/android/ex/chips/RecipientEditTextView.java b/chips/src/com/android/ex/chips/RecipientEditTextView.java
index 6ee9986..0a1cdff 100644
--- a/chips/src/com/android/ex/chips/RecipientEditTextView.java
+++ b/chips/src/com/android/ex/chips/RecipientEditTextView.java
@@ -1987,7 +1987,8 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements
return constructChipSpan(
RecipientEntry.constructFakeEntry((String) text, isValid(text.toString())),
true, false);
- } else if (currentChip.getContactId() == RecipientEntry.GENERATED_CONTACT) {
+ } else if (currentChip.getContactId() == RecipientEntry.GENERATED_CONTACT
+ || currentChip.isGalContact()) {
int start = getChipStart(currentChip);
int end = getChipEnd(currentChip);
getSpannable().removeSpan(currentChip);
diff --git a/chips/src/com/android/ex/chips/RecipientEntry.java b/chips/src/com/android/ex/chips/RecipientEntry.java
index 44bc767..30fccae 100644
--- a/chips/src/com/android/ex/chips/RecipientEntry.java
+++ b/chips/src/com/android/ex/chips/RecipientEntry.java
@@ -74,9 +74,11 @@ public class RecipientEntry {
*/
private byte[] mPhotoBytes;
+ private final boolean mIsGalContact;
+
private RecipientEntry(int entryType, String displayName, String destination,
int destinationType, String destinationLabel, long contactId, long dataId,
- Uri photoThumbnailUri, boolean isFirstLevel, boolean isValid) {
+ Uri photoThumbnailUri, boolean isFirstLevel, boolean isValid, boolean isGalContact) {
mEntryType = entryType;
mIsFirstLevel = isFirstLevel;
mDisplayName = displayName;
@@ -89,6 +91,7 @@ public class RecipientEntry {
mPhotoBytes = null;
mIsDivider = false;
mIsValid = isValid;
+ mIsGalContact = isGalContact;
}
public boolean isValid() {
@@ -114,7 +117,7 @@ public class RecipientEntry {
return new RecipientEntry(ENTRY_TYPE_PERSON, tokenizedAddress, tokenizedAddress,
INVALID_DESTINATION_TYPE, null,
- INVALID_CONTACT, INVALID_CONTACT, null, true, isValid);
+ INVALID_CONTACT, INVALID_CONTACT, null, true, isValid, false /* isGalContact */);
}
/**
@@ -124,7 +127,7 @@ public class RecipientEntry {
final boolean isValid) {
return new RecipientEntry(ENTRY_TYPE_PERSON, phoneNumber, phoneNumber,
INVALID_DESTINATION_TYPE, null,
- INVALID_CONTACT, INVALID_CONTACT, null, true, isValid);
+ INVALID_CONTACT, INVALID_CONTACT, null, true, isValid, false /* isGalContact */);
}
/**
@@ -146,34 +149,35 @@ public class RecipientEntry {
public static RecipientEntry constructGeneratedEntry(String display, String address,
boolean isValid) {
return new RecipientEntry(ENTRY_TYPE_PERSON, display, address, INVALID_DESTINATION_TYPE,
- null, GENERATED_CONTACT, GENERATED_CONTACT, null, true, isValid);
+ null, GENERATED_CONTACT, GENERATED_CONTACT, null, true, isValid,
+ false /* isGalContact */);
}
public static RecipientEntry constructTopLevelEntry(String displayName, int displayNameSource,
String destination, int destinationType, String destinationLabel, long contactId,
- long dataId, Uri photoThumbnailUri, boolean isValid) {
+ long dataId, Uri photoThumbnailUri, boolean isValid, boolean isGalContact) {
return new RecipientEntry(ENTRY_TYPE_PERSON, pickDisplayName(displayNameSource,
displayName, destination), destination, destinationType, destinationLabel,
- contactId, dataId, photoThumbnailUri, true, isValid);
+ contactId, dataId, photoThumbnailUri, true, isValid, isGalContact);
}
public static RecipientEntry constructTopLevelEntry(String displayName, int displayNameSource,
String destination, int destinationType, String destinationLabel, long contactId,
- long dataId, String thumbnailUriAsString, boolean isValid) {
+ long dataId, String thumbnailUriAsString, boolean isValid, boolean isGalContact) {
return new RecipientEntry(ENTRY_TYPE_PERSON, pickDisplayName(displayNameSource,
displayName, destination), destination, destinationType, destinationLabel,
contactId, dataId, (thumbnailUriAsString != null ? Uri.parse(thumbnailUriAsString)
- : null), true, isValid);
+ : null), true, isValid, isGalContact);
}
public static RecipientEntry constructSecondLevelEntry(String displayName,
int displayNameSource, String destination, int destinationType,
String destinationLabel, long contactId, long dataId, String thumbnailUriAsString,
- boolean isValid) {
+ boolean isValid, boolean isGalContact) {
return new RecipientEntry(ENTRY_TYPE_PERSON, pickDisplayName(displayNameSource,
displayName, destination), destination, destinationType, destinationLabel,
contactId, dataId, (thumbnailUriAsString != null ? Uri.parse(thumbnailUriAsString)
- : null), false, isValid);
+ : null), false, isValid, isGalContact);
}
public int getEntryType() {
@@ -230,6 +234,10 @@ public class RecipientEntry {
return mEntryType == ENTRY_TYPE_PERSON;
}
+ public boolean isGalContact() {
+ return mIsGalContact;
+ }
+
@Override
public String toString() {
return mDisplayName + " <" + mDestination + ">, isValid=" + mIsValid;
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();
}
diff --git a/chips/tests/src/com/android/ex/chips/RecipientAlternatesAdapterTest.java b/chips/tests/src/com/android/ex/chips/RecipientAlternatesAdapterTest.java
index a1a1c7a..d4c0460 100644
--- a/chips/tests/src/com/android/ex/chips/RecipientAlternatesAdapterTest.java
+++ b/chips/tests/src/com/android/ex/chips/RecipientAlternatesAdapterTest.java
@@ -120,7 +120,8 @@ public class RecipientAlternatesAdapterTest extends AndroidTestCase {
{
final RecipientEntry entry1 =
RecipientEntry.constructTopLevelEntry("Android", DisplayNameSources.NICKNAME,
- "1@android.com", 0, null, 0, 0, (Uri) null, true);
+ "1@android.com", 0, null, 0, 0, (Uri) null, true,
+ false /* isGalContact */);
final RecipientEntry entry2 = RecipientEntry.constructFakeEntry("1@android.com", true);
assertEquals(RecipientAlternatesAdapter.getBetterRecipient(entry1, entry2), entry1);
@@ -132,10 +133,12 @@ public class RecipientAlternatesAdapterTest extends AndroidTestCase {
{
final RecipientEntry entry1 =
RecipientEntry.constructTopLevelEntry("Android", DisplayNameSources.NICKNAME,
- "1@android.com", 0, null, 0, 0, (Uri) null, true);
+ "1@android.com", 0, null, 0, 0, (Uri) null, true,
+ false /* isGalContact */);
final RecipientEntry entry2 =
RecipientEntry.constructTopLevelEntry("2@android.com", DisplayNameSources.EMAIL,
- "2@android.com", 0, null, 0, 0, (Uri) null, true);
+ "2@android.com", 0, null, 0, 0, (Uri) null, true,
+ false /* isGalContact */);
assertEquals(RecipientAlternatesAdapter.getBetterRecipient(entry1, entry2), entry1);
assertEquals(RecipientAlternatesAdapter.getBetterRecipient(entry2, entry1), entry1);
@@ -146,10 +149,11 @@ public class RecipientAlternatesAdapterTest extends AndroidTestCase {
final RecipientEntry entry1 =
RecipientEntry.constructTopLevelEntry("Android", DisplayNameSources.NICKNAME,
"1@android.com", 0, null, 0, 0, Uri.parse("http://www.android.com"),
- true);
+ true, false /* isGalContact */);
final RecipientEntry entry2 =
RecipientEntry.constructTopLevelEntry("Android", DisplayNameSources.EMAIL,
- "2@android.com", 0, null, 0, 0, (Uri) null, true);
+ "2@android.com", 0, null, 0, 0, (Uri) null, true,
+ false /* isGalContact */);
assertEquals(RecipientAlternatesAdapter.getBetterRecipient(entry1, entry2), entry1);
assertEquals(RecipientAlternatesAdapter.getBetterRecipient(entry2, entry1), entry1);