From 44eb5f95c00a748e3a391f34ee27ddedd3ec9500 Mon Sep 17 00:00:00 2001
From: mindyp <mindyp@google.com>
Date: Mon, 3 Dec 2012 12:16:33 -0800
Subject: Merge from ur8

Merges in:
Fixup delete logic

Its only a delete if the user has removed a single character,
otherwise, we are looking at replacement, probably from a reverse lookup
Ia7c7b94d9e2fb037cb19abdb6696f7df0d351856

Make sure we only use the invisible chips optimization if we are showing the "more" chip

In the case of calendar, we never shrink the field, so this optimization
can't be used
I30e3312b8e686be5143f96d3d2820e023158957d

mMaxLines was not being set correctly; dont draw hidden chips on first render pass

mMaxLines was always zero
Setting the value correctly avoids an extra layout which makes it faster
to render chips
Use an "invisible" recipient chip for anything > than max chips we can show before
showing the more chip; this avoids a lot of unnecessary drawing and decoding of 9 patches
in the first pass; once these are resolved (or the user makes them visible), they will be correctly
drawn as visible chips
Part of b/7492291 First 2 contacts takes too long to resolve into chips when there are many contacts
I37817381f93efb968940031d8a8b77fb62c8919a
Change-Id: I4cbe5eacaa6fc5d1d94a5663133da82621582824
---
 chips/res/values/dimen.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'chips/res')

diff --git a/chips/res/values/dimen.xml b/chips/res/values/dimen.xml
index b93555f..98354d2 100644
--- a/chips/res/values/dimen.xml
+++ b/chips/res/values/dimen.xml
@@ -19,4 +19,5 @@
     <dimen name="chip_height">32dip</dimen>
     <dimen name="chip_text_size">14sp</dimen>
     <dimen name="line_spacing_extra">4dip</dimen>
+    <integer name="chips_max_lines">-1</integer>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3