summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove google-common from ContactsCommon Android.mk fileYorke Lee2014-03-271-1/+0
| | | | | Bug: 12573111 Change-Id: Ib9d87c866f3f671e8a04225a811779826b8f4055
* am 75718efa: (-s ours) am ff6d171f: (-s ours) am fec9accd: (-s ours) am ↵Baligh Uddin2014-03-200-0/+0
|\ | | | | | | | | | | | | de98f352: (-s ours) am 54eb09f7: (-s ours) Import translations. DO NOT MERGE * commit '75718efa2571a31dfdf4b52a9e732d76606e7348': Import translations. DO NOT MERGE
| * am ff6d171f: (-s ours) am fec9accd: (-s ours) am de98f352: (-s ours) am ↵Baligh Uddin2014-03-200-0/+0
| |\ | | | | | | | | | | | | | | | | | | 54eb09f7: (-s ours) Import translations. DO NOT MERGE * commit 'ff6d171f920592c34df52dff061e002b485e553e': Import translations. DO NOT MERGE
| | * am fec9accd: (-s ours) am de98f352: (-s ours) am 54eb09f7: (-s ours) Import ↵Baligh Uddin2014-03-200-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'fec9accdd677de9465aa7f5c326b446476ceecf7': Import translations. DO NOT MERGE
| | | * am de98f352: (-s ours) am 54eb09f7: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-03-200-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit 'de98f35240d75c41621609210d182999541bca6a': Import translations. DO NOT MERGE
| | | | * am 54eb09f7: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-03-200-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '54eb09f74f60ba122ffec9c6381df59ab714f996': Import translations. DO NOT MERGE
| | | | | * Import translations. DO NOT MERGEBaligh Uddin2014-03-193-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic58eabdabe9534d3611f4d247558095b8f50b3e5 Auto-generated-cl: translation import
* | | | | | Merge "Remove unused fields in ContactLoader"Yorke Lee2014-03-203-64/+51
|\ \ \ \ \ \
| * | | | | | Remove unused fields in ContactLoaderYorke Lee2014-03-203-64/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RawContacts.ACCOUNT_TYPE_AND_DATA_SET Data.RES_PACKAGE These fields are private in ContactsContract and are not actually used anywhere else within Contacts or Dialer. Bug: 6948882 Change-Id: Ie5ca6d9c37fa40f2c5d7d27e15fdbf745f8fc74f
* | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-03-203-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-03-193-4/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id9e24cc6d8cced401d10e0dcc0d04805c2b94b06 Auto-generated-cl: translation import
* / / / / / / Fix ContactsCommon testsYorke Lee2014-03-186-26/+23
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove stale testSetMask_LengthMismatch test Update SpannedTestUtils to check for StyleSpan instead of ForegroundColorSpan Add READ_CONTACTS permission Bug: 13516535 Change-Id: Ibe10ca6cde42277697dc185e4cab35238d190023
* | | | | | am 2c961447: (-s ours) am fbbe24da: (-s ours) am 69c41866: (-s ours) am ↵Geoff Mendal2014-03-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c0c18d0: (-s ours) am 1aa9baea: (-s ours) Import translations. DO NOT MERGE * commit '2c96144731044be2c8a3fe9094685cfb00a49fee': Import translations. DO NOT MERGE
| * | | | | am fbbe24da: (-s ours) am 69c41866: (-s ours) am 4c0c18d0: (-s ours) am ↵Geoff Mendal2014-03-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1aa9baea: (-s ours) Import translations. DO NOT MERGE * commit 'fbbe24dae29ee1e8fb9df99ce4431ef91decaa37': Import translations. DO NOT MERGE
| | * | | | am 69c41866: (-s ours) am 4c0c18d0: (-s ours) am 1aa9baea: (-s ours) Import ↵Geoff Mendal2014-03-180-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '69c41866030a9fb1b33f6bcd4cbdf14d47eeaf9c': Import translations. DO NOT MERGE
| | | * | | am 4c0c18d0: (-s ours) am 1aa9baea: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-03-170-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4c0c18d06b38fd42f6299e35040ee130f25535fc': Import translations. DO NOT MERGE
| | | | * | am 1aa9baea: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-03-170-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '1aa9baeab595ddb84967a7dbb457e28db895b709': Import translations. DO NOT MERGE
| | | | | * Import translations. DO NOT MERGEGeoff Mendal2014-03-171-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7ade005640f53630b3f8541669bfe4f70510c347 Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-03-171-4/+4
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-03-171-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie59292436620bb80d958dfb479db5793d3dd1604 Auto-generated-cl: translation import
* | | | | | | Remove unused Groups.ACCOUNT_TYPE_AND_DATA_SET column from queryYorke Lee2014-03-171-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6948882 Change-Id: Ic11a4f826c1fa6aa461b0b1312fd215ae9b4b126
* | | | | | | Fix usage of PhoneNumberUtils.isUriNumberYorke Lee2014-03-171-2/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PhoneNumberUtils.isUriNumber is private and should not be used. Bug: 6948882 Change-Id: I0724364080a402b64c78f2d82aed72e9acc04111
* | | | | | Remove references to private view propertiesYorke Lee2014-03-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch usages of mTop, mBottom, mRight and mLeft which are hidden View properties to their non-hidden getter functions instead. Bug: 6948882 Change-Id: I528ab18bc91eaacc784c1e79a9a417421e14e0cd
* | | | | | Remove unused drawables in ldrtl foldersYorke Lee2014-03-0712-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie50a1fd0e47a59def9feb0367d1e01487b789b43
* | | | | | am c5adb847: am 7b0193f0: am 43622e05: am eefddcff: am 09874cf9: am ↵Yorke Lee2014-03-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18cfd4bd: Fix ShortcutIntentBuilder to use LetterTileDrawables * commit 'c5adb8474f90c57fcdb449ae5eb2a12785b25936': Fix ShortcutIntentBuilder to use LetterTileDrawables
| * | | | | am 7b0193f0: am 43622e05: am eefddcff: am 09874cf9: am 18cfd4bd: Fix ↵Yorke Lee2014-03-051-25/+37
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ShortcutIntentBuilder to use LetterTileDrawables * commit '7b0193f042266fd3e3d3e9dd155a5b46fac8995a': Fix ShortcutIntentBuilder to use LetterTileDrawables
| | * | | | am 43622e05: am eefddcff: am 09874cf9: am 18cfd4bd: Fix ↵Yorke Lee2014-03-051-25/+37
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ShortcutIntentBuilder to use LetterTileDrawables * commit '43622e05998d82a2333d9e7fdd6b8011fc3c7c8e': Fix ShortcutIntentBuilder to use LetterTileDrawables
| | | * | | am eefddcff: am 09874cf9: am 18cfd4bd: Fix ShortcutIntentBuilder to use ↵Yorke Lee2014-03-051-25/+37
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LetterTileDrawables * commit 'eefddcffa2e3cc52c45990b20d54e10e93443801': Fix ShortcutIntentBuilder to use LetterTileDrawables
| | | | * | | am 09874cf9: am 18cfd4bd: Fix ShortcutIntentBuilder to use LetterTileDrawablesYorke Lee2014-03-051-25/+37
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '09874cf921c46641d57aa1008938fed01f5cfbbf': Fix ShortcutIntentBuilder to use LetterTileDrawables
| | | | | * | am 18cfd4bd: Fix ShortcutIntentBuilder to use LetterTileDrawablesYorke Lee2014-03-051-25/+37
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '18cfd4bd42097c572300c318bdc8e18135ff2809': Fix ShortcutIntentBuilder to use LetterTileDrawables
| | | | | | * Fix ShortcutIntentBuilder to use LetterTileDrawablesYorke Lee2014-03-051-25/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use LetterTileDrawables, instead of Bitmap drawables when generating shortcut icons for contacts without a contact photo. To do this, the methods generatePhoneNumberIcon() and generateQuickContactIcon have to be modified to draw a drawable on the canvas instead of a bitmap. Bug: 13279862 Change-Id: Ife7bbca27a7d1b942c8a8ea908dd9896c5fe063a (cherry picked from commit 30dd6e7e1a9279b91e9ee0ad36c34545c5b6c45a)
* | | | | | | am 9f383378: am 3c261b14: am 54377fb7: am 8559dbed: am 28257f2b: am ↵Yorke Lee2014-03-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2c694be: Tweaks to redlines for letter tile avatars * commit '9f383378b5b5d2656613a25a232ffa68c2ce2257': Tweaks to redlines for letter tile avatars
| * | | | | | am 3c261b14: am 54377fb7: am 8559dbed: am 28257f2b: am d2c694be: Tweaks to ↵Yorke Lee2014-03-052-10/+22
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | redlines for letter tile avatars * commit '3c261b1422b12de9a5cdaeb646385d7b97a710a5': Tweaks to redlines for letter tile avatars
| | * | | | | am 54377fb7: am 8559dbed: am 28257f2b: am d2c694be: Tweaks to redlines for ↵Yorke Lee2014-03-052-10/+22
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | letter tile avatars * commit '54377fb7f2121fc1c69eb34c80a3bf6744fe9407': Tweaks to redlines for letter tile avatars
| | | * | | | am 8559dbed: am 28257f2b: am d2c694be: Tweaks to redlines for letter tile ↵Yorke Lee2014-03-052-10/+22
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avatars * commit '8559dbed29a3367dbe42149a61c5c8b36b5a025c': Tweaks to redlines for letter tile avatars
| | | | * | | am 28257f2b: am d2c694be: Tweaks to redlines for letter tile avatarsYorke Lee2014-03-052-10/+22
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '28257f2b5598eb091a04e041e13e5363c5903296': Tweaks to redlines for letter tile avatars
| | | | | * | am d2c694be: Tweaks to redlines for letter tile avatarsYorke Lee2014-03-052-10/+22
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd2c694be5f75eecc74bca0008d27de9177abfc01': Tweaks to redlines for letter tile avatars
| | | | | | * Tweaks to redlines for letter tile avatarsYorke Lee2014-03-052-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add overridable method for subclasses to define their own layout based on whether or not the contact photo is a letter tile avatar * Update color palette for letter tile avatar backgrounds Bug: 13101785 Change-Id: I69759d17867b15f9b7e35b1c48e9d85e4470cd56 (cherry picked from commit 906ffc8a0655f0e78a9b7307e7e76717bfdc6d58)
* | | | | | | am fdc10f43: (-s ours) am ee8df761: am 5ff42dbb: am 0144b772: am 2c5e1207: ↵Jay Shrauner2014-03-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 86f4cd9f: Merge "Add support for letter tile avatars to ContactsPhotoManager" into klp-dev * commit 'fdc10f439aa31e5a8a8f36300fb0ae0a95360f50': Add support for letter tile avatars to ContactsPhotoManager
| * | | | | | am ee8df761: am 5ff42dbb: am 0144b772: am 2c5e1207: am 86f4cd9f: Merge "Add ↵Jay Shrauner2014-03-0543-65/+623
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support for letter tile avatars to ContactsPhotoManager" into klp-dev * commit 'ee8df7615a48a8fe9372ff4c013774d661413b73': Add support for letter tile avatars to ContactsPhotoManager
| | * | | | | am 5ff42dbb: am 0144b772: am 2c5e1207: am 86f4cd9f: Merge "Add support for ↵Jay Shrauner2014-03-0543-65/+623
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | letter tile avatars to ContactsPhotoManager" into klp-dev * commit '5ff42dbbd58b50b622f5979908ceb1f1193c8a42': Add support for letter tile avatars to ContactsPhotoManager
| | | * | | | am 0144b772: am 2c5e1207: am 86f4cd9f: Merge "Add support for letter tile ↵Jay Shrauner2014-03-0543-65/+623
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avatars to ContactsPhotoManager" into klp-dev * commit '0144b772356a852accbe86bfe8e2e6efbf7ae4cb': Add support for letter tile avatars to ContactsPhotoManager
| | | | * | | am 2c5e1207: am 86f4cd9f: Merge "Add support for letter tile avatars to ↵Jay Shrauner2014-03-0543-65/+623
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ContactsPhotoManager" into klp-dev * commit '2c5e1207ee3b5d97ccb81d5c966dd9e8e59874a4': Add support for letter tile avatars to ContactsPhotoManager
| | | | | * | am 86f4cd9f: Merge "Add support for letter tile avatars to ↵Jay Shrauner2014-03-0543-65/+623
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ContactsPhotoManager" into klp-dev * commit '86f4cd9fee562be6e101aef5e9c2e9463a57a093': Add support for letter tile avatars to ContactsPhotoManager
| | | | | | * Merge "Add support for letter tile avatars to ContactsPhotoManager" into klp-devJay Shrauner2014-03-0543-65/+623
| | | | | | |\
| | | | | | | * Add support for letter tile avatars to ContactsPhotoManagerYorke Lee2014-03-0443-65/+623
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add LetterTileDrawable, a custom drawable used to display letter tiles for contacts without a contact photo, instead of static bitmap resource drawables. * Add a class DefaultImageRequest to ContactPhotoManager. This is essentially a data holder object used to store and retrieve various parameters that clients can use to configure the way they want their requested letter tile avatars to be drawn. * Add LetterTileImageProvider to ContactPhotoManager. LetterTileImageProvider extends DefaultImageProvider, but returns instances of LetterTileDrawable instead of BitmapDrawables when a default contact image is needed. * Add two new APIs to ContactPhotoManager: getDefaultAvatarForContact - This returns an instance of a LetterTileDrawable, configured with the display parameters stored in the provided DefaultImageRequest. getDefaultAvatarUriForContact - This returns an uri which the ContactPhotoManager can use to recreate a DefaultImageRequest and hence a LetterTileDrawable. * Modify ContactPhotoManager.loadPhoto and loadThumbnail to accept a DefaultImageRequest as a parameter. * Modify the following classes to use the new ContactPhotoManager APIs. These affect both the Dialer and People apps. ContactEntryListADapter ContactListAdapter ContactTileView PhoneNumberListAdapter Bug: 13101785 Change-Id: Id1a87b459d6e63c42049739059a3b3ee202af837 (cherry picked from commit 6084726fbdda78bdb16e2d4cc1c3b81c84fd5da1)
* | | | | | | | am 896693f8: am cab65436: am 75efc434: am 6088698e: am 8f51429d: am ↵Yorke Lee2014-03-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | efa79daa: Make ContactTileLoaderFactory.COLUMNS_PHONE_ONLY visible for testing * commit '896693f8c35984373c2c44fc0d2e15665019ff23': Make ContactTileLoaderFactory.COLUMNS_PHONE_ONLY visible for testing
| * | | | | | | am cab65436: am 75efc434: am 6088698e: am 8f51429d: am efa79daa: Make ↵Yorke Lee2014-03-041-1/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ContactTileLoaderFactory.COLUMNS_PHONE_ONLY visible for testing * commit 'cab654369292e17eb338aca05605c26c6606186b': Make ContactTileLoaderFactory.COLUMNS_PHONE_ONLY visible for testing
| | * | | | | | am 75efc434: am 6088698e: am 8f51429d: am efa79daa: Make ↵Yorke Lee2014-03-041-1/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ContactTileLoaderFactory.COLUMNS_PHONE_ONLY visible for testing * commit '75efc43448e2bbe1a61fdf85401dedaede9f4450': Make ContactTileLoaderFactory.COLUMNS_PHONE_ONLY visible for testing
| | | * | | | | am 6088698e: am 8f51429d: am efa79daa: Make ↵Yorke Lee2014-03-041-1/+4
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ContactTileLoaderFactory.COLUMNS_PHONE_ONLY visible for testing * commit '6088698e814f72e1547d91a76c75acb4ba6644a7': Make ContactTileLoaderFactory.COLUMNS_PHONE_ONLY visible for testing