android_frameworks_ex/chips/res, branch stable/cm-10.2

Merge branch 'goog/jb-ub-mail-ur8' into master

2013-02-15T18:49:18+00:00

Conflicts:
	photoviewer/AndroidManifest.xml
	photoviewer/res/values/dimen.xml
	photoviewer/src/com/android/ex/photo/Intents.java
	photoviewer/src/com/android/ex/photo/PhotoViewActivity.java
	photoviewer/src/com/android/ex/photo/adapters/BaseCursorPagerAdapter.java
	photoviewer/src/com/android/ex/photo/adapters/BaseFragmentPagerAdapter.java
	photoviewer/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java
	photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
	photoviewer/src/com/android/ex/photo/provider/PhotoContract.java
	photoviewer/src/com/android/ex/photo/util/ImageUtils.java
	photoviewer/src/com/android/ex/photo/views/PhotoView.java

Change-Id: Icb06b228f0eab1f828a21507ec2fbe7ede998536

Import translations. DO NOT MERGE

2013-02-04T16:59:19+00:00

Change-Id: I6f9183aa473c483afec9a293cd22914471faf9c5
Auto-generated-cl: translation import

Use same default contact photo for list items and chips

2012-12-10T19:58:29+00:00

Fixes b/7706601 which asset do we want to use for the default contact icon?

Change-Id: I0bd414aefb783a4a64ce0041dcd8f7f8d5911b83

Merge from ur8

2012-12-03T20:24:25+00:00

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

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

2012-12-03T16:45:54+00:00

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

Change-Id: I37817381f93efb968940031d8a8b77fb62c8919a

Import translations. DO NOT MERGE

2012-09-05T19:34:01+00:00

Change-Id: I5c19caa87369ca3bfcacaf0a88333fc5de938496
Auto-generated-cl: translation import

Import translations. DO NOT MERGE

2012-07-13T18:52:15+00:00

Change-Id: Id27c1e5a3d49f4d0e27e58ec7d6613790e9c2c4e
Auto-generated-cl: translation import

Import translations. DO NOT MERGE

2012-07-13T18:51:17+00:00

Change-Id: I63a6ae5791be411633854b5aceafdb078762d21b
Auto-generated-cl: translation import

Import translations. DO NOT MERGE

2012-07-12T18:54:01+00:00

Change-Id: Iaa3c2995b7bf99bd1572e7bad7beee7cc5bdfc41
Auto-generated-cl: translation import

Import translations. DO NOT MERGE

2012-07-12T18:52:56+00:00

Change-Id: I942013958098aa904d57cc8f395d46ae69baba08
Auto-generated-cl: translation import