summaryrefslogtreecommitdiffstats
path: root/chips/src/com/android
Commit message (Collapse)AuthorAgeFilesLines
* am 3be35a39: Remove some unused resources and importsScott Kennedy2013-08-221-1/+0
|\ | | | | | | | | * commit '3be35a398afee202a794134920782db901ee36cd': Remove some unused resources and imports
| * Remove some unused resources and importsScott Kennedy2013-08-221-1/+0
| | | | | | | | Change-Id: Ifc9bbd7fa53972b4d2bd61d04a426017a6bd63f5
* | am 30d26326: Add directory photo supportJay Shrauner2013-08-091-14/+46
|\| | | | | | | | | * commit '30d26326568cb888430468370df6f6ab2ec12767': Add directory photo support
| * Add directory photo supportJay Shrauner2013-08-091-14/+46
| | | | | | | | | | | | | | Load photos for directory thumbnail URIs by streaming directly from the URI. Bug:7882158 Change-Id: Ifdf354c392b9aaff7c8fd6b73dc9bfe891825329 (cherry picked from commit 53d11c53b83bffe7607cffde994f505e775bcdbe)
* | am bc742af5: Make Chips work on API 11+Scott Kennedy2013-08-062-3/+50
|\| | | | | | | | | * commit 'bc742af5bb568ed39dc37764587120928d068330': Make Chips work on API 11+
| * Make Chips work on API 11+Scott Kennedy2013-08-022-3/+50
| | | | | | | | | | | | | | | | By using the support library, and copying a few methods from TextView into RecipientEditTextView, we can support chips back to API 11. Bug: 8744878 Change-Id: I2d9bb43e71556504e929dcdccff9dae347020f28
* | resolved conflicts for merge of b6c18ed6 to masterScott Kennedy2013-08-011-4/+0
|\| | | | | | | Change-Id: I7617af351d1fa7e4ce9ff401beffe21690b429d3
| * Remove an unnecessary null checkScott Kennedy2013-08-011-4/+0
| | | | | | | | | | Bug: 9497893 Change-Id: Ib363fc4b93a53c343e0e4cd4766038fee8324850
* | am ad1d181c: Don\'t bother storing a null value in the cacheScott Kennedy2013-07-301-2/+4
|\| | | | | | | | | * commit 'ad1d181cd21ee598512c142150e79be754209548': Don't bother storing a null value in the cache
| * Don't bother storing a null value in the cacheScott Kennedy2013-07-291-2/+4
| | | | | | | | | | | | | | It serves very little purpose, and it causes an NPE. Bug: 9286049 Change-Id: I8c95d8ded2bebdc9b904ef788cbc70865144213e
* | Support an External Dictionary of ContactsAlon Albert2013-07-213-33/+74
|/ | | | | | | | | | | | | | | | | | | | | | | | | Allow support for an external custom source of contacts. By making some classes & methods protected rather than private, it's possible to allow for a derived class to extend the Chips behavior to load contacts from an arbitrary source. Most of the changes here are just access modifier changes but there's one more substantial change: Intruduced BaseRecipientAdapter#getMatchingRecipients() which matches generated recipients with proper chips recipients from the external sources. Ideally RecipientAlternatesAdapter#getMatchingRecipients() should reside in the adaper too but the goal of this CL was to do this minimal modifications. There's also a small change that beileve was a bug in IndividualReplacementTask: The matchesFound() callback gets a list of matches found. It then iterates all the original recipients and looks for those that have matches and replaces them. So far so good but, if the original recipient doesn't have a match and is not a phone number, the old code still replaces it with itself when it can simply skip it I think. Change-Id: I24e89f93ec15154ed8912664cd061fa2b5b18bd8
* Prepare to remove a null checkScott Kennedy2013-06-191-0/+1
| | | | | | | | | | | I am fairly convinced that the fix for 9408464 will also fix the underlying problem of this adapter being null. If this log method is ever called, then I'll know it didn't work, but I believe this will never be called. Bug: 9497893 Change-Id: I08518ceecee6985462d0165fb16b1dea95181b07
* Fix a NPEScott Kennedy2013-06-071-27/+33
| | | | | | | | We may not get a cursor back from query(), and if that happens, we shouldn't try to use the null cursor. Bug: 9287151 Change-Id: Ie91d8003f51ea160e5b709a5cd6bcabefc3c687a
* Prevent NPE in chipsAlice Yang2013-04-261-3/+7
| | | | | | Bug 8733626 Change-Id: Id74ed7de4f16f9a7e716b4e9f2152dded97a91e9
* Prevent IOOB exceptionPaul Westbrook2013-04-221-1/+2
| | | | | | | | | | The chips code was expecting a space after an email address when replacing it with a chip. If there is no extra space (which can happen when receiving an intent) don't walk off the end of the string Bug: 8635860 Change-Id: I1d40a08f1cbf11740172b0ea62ab11d656fb23f9
* Merge "Messaging crash on selecting a contact from the auto complete list in ↵Tom Taylor2013-04-151-0/+3
|\ | | | | | | landscape mode" into jb-mr2-dev
| * Messaging crash on selecting a contact from the auto complete list in ↵Tom Taylor2013-04-101-0/+3
| | | | | | | | | | | | | | | | landscape mode Bug 8540624 Change-Id: If95d1d35cfd0018280ba31a6ef66e9f42f8e1980
* | Don't do chip resolving in placeScott Kennedy2013-04-111-11/+11
|/ | | | | | | | | Make a copy of the text, and do the replacements in this copy, so that we aren't calling back to any TextView watchers. This speeds up the process by over 90%. Bug: 8513563 Change-Id: Iff289f8fe24792f1aef657a9b5b4f3457bcbb946
* am da491f04: Prevent a potential ANRScott Kennedy2013-04-051-30/+39
|\ | | | | | | | | * commit 'da491f048fb33b572713b4287436c1cac6898670': Prevent a potential ANR
| * Prevent a potential ANRScott Kennedy2013-04-051-30/+39
| | | | | | | | | | | | | | | | Move this code into an AsyncTask, since createAlternatesAdapter() can take a while to return. Bug: 8519276 Change-Id: I7b3f30ab13ed894e80ac26c365dcb3cbe178dd37
* | StringIndexOutOfBoundsException in Chips during monkey runTom Taylor2013-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | Bug 8478568 The code was looking for a comma and not finding one, but since the length of the token was zero, the "if" clause was executed and tried to make a substring of length -1. Change-Id: Ic876fd6b5880c452b27083fb23cf78da994e0225
* | am f5ecf6ad: Add unit test for creating fake phone entriesScott Kennedy2013-03-221-1/+2
|\| | | | | | | | | * commit 'f5ecf6ad067fb1036199ad5125949aae7ffd9689': Add unit test for creating fake phone entries
| * Add unit test for creating fake phone entriesScott Kennedy2013-03-221-1/+2
| | | | | | | | | | | | | | | | There was a problem with numbers formatted like: "(888) 555-1234". Bug: 8449554 Change-Id: Ic70998104bd5151aba2dca5202bc4f99ced362be
| * Cherry-pick: Area code gets eaten in ChipsTom Taylor2013-03-212-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | Bug 8436028 New code for tokenizing an address stripped the area code from a manually entered phone number. When chips is in "phone number" mode, call a new function (essentially the old function before the change) to create a fake entry directly from the phone number. Cherry-pick of: I2d62ff24aacd8eadb9086840bd4d003cf39db177 Change-Id: I08d98c2e358fc1b8a70bacf358497a511fd71069
| * ArrayIndexOutOfBoundsException in RecipientEntry.constructFakeEntryTom Taylor2013-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | Bug 8423230 Fix a monkey bug that is showing up a lot in MR2. Use the original address when tokenizing an address fails to return anything. Cherry-pick of: I4ac42f81aa6e4cbdad058f73bb3a1fd62ab2e138 Change-Id: I0f41f3e169086dcd89e51cdf211985e9bf1a3ade
| * Cherry-pick Fix a Dead Loop issue in RecipientEditTextViewjli119X2013-03-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From AOSP: I01183680289919105dadc28ffd40c8e60dfd6b7e The old code logic will cause dead loop when pasting phone number to recipient. Change-Id: I608f1bf2a5d5651f51be419f7b6125358f2389e2 Author: Jianping Li <jianpingx.li@intel.com> Signed-off-by: Jianping Li <jianpingx.li@intel.com> Signed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 58793
* | Area code gets eaten in ChipsTom Taylor2013-03-212-1/+11
| | | | | | | | | | | | | | | | | | | | | | Bug 8436028 New code for tokenizing an address stripped the area code from a manually entered phone number. When chips is in "phone number" mode, call a new function (essentially the old function before the change) to create a fake entry directly from the phone number. Change-Id: I2d62ff24aacd8eadb9086840bd4d003cf39db177
* | ArrayIndexOutOfBoundsException in RecipientEntry.constructFakeEntryTom Taylor2013-03-191-1/+1
| | | | | | | | | | | | | | | | | | Bug 8423230 Fix a monkey bug that is showing up a lot in MR2. Use the original address when tokenizing an address fails to return anything. Change-Id: I4ac42f81aa6e4cbdad058f73bb3a1fd62ab2e138
* | am e46cb66d: Always close this cursorScott Kennedy2013-03-141-4/+11
|\| | | | | | | | | * commit 'e46cb66d4265b6fb8800f9120086151b36011f0f': Always close this cursor
| * Always close this cursorScott Kennedy2013-03-131-4/+11
| | | | | | | | | | | | Bug: 8375851 Change-Id: I6aa528091615319722ea7b101bb1cda42c97d122
* | resolved conflicts for merge of 35d3af70 to jb-mr2-devScott Kennedy2013-03-141-2/+2
|\ \ | | | | | | | | | Change-Id: If85946ef3dbf82eb3a790adf320765e4a25d91dc
| * \ Merge "Fix a Dead Loop issue in RecipientEditTextView"Scott Kennedy2013-03-141-2/+2
| |\ \
| | * | Fix a Dead Loop issue in RecipientEditTextViewjli119X2013-01-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old code logic will cause dead loop when pasting phone number to recipient. Change-Id: I01183680289919105dadc28ffd40c8e60dfd6b7e Author: Jianping Li <jianpingx.li@intel.com> Signed-off-by: Jianping Li <jianpingx.li@intel.com> Signed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 58793
* | | | Merge remote-tracking branch 'goog/jb-ub-mail-ur9' into mergeAlice Yang2013-03-1311-425/+470
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | Merge UR8 into MR2. Change-Id: Ia04852cf84c05ab2ee4898662d347a06d40e5f11
| * | | Refactor some of thie chips codeScott Kennedy2013-03-087-335/+383
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VisibleRecipientChip and InvisibleRecipientChip had a lot of the same code, so I moved it all into a delegate class. This resulted in a bunch of "RecipientChip" classes, so I moved them all into their own sub-package. Change-Id: I01dfc931e006270dd37721c73e7bc3c0e7b67515
| * | | Add a test case for b/8321211Scott Kennedy2013-03-061-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emails like: "Ex Ample" <example@example.com> were displaying improperly. Change-Id: Idd43814352e0c4455733adc13b89eb6fc1aca1bb
| * | | Merge "Initial clean up of the chips code" into jb-ub-mail-ur9Scott Kennedy2013-03-076-62/+73
| |\ \ \
| | * | | Initial clean up of the chips codeScott Kennedy2013-03-066-62/+73
| | | | | | | | | | | | | | | | | | | | Change-Id: I56a3dd5968a3ea435d6dcae9256021bac1f74ee6
| * | | | Fix a failing testScott Kennedy2013-03-061-2/+7
| |/ / / | | | | | | | | | | | | Change-Id: Iaa45618d69ea12aa6714bcae36c8f12a253d5df2
| * | | Unit test for getBetterRecipient()Scott Kennedy2013-03-061-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Follow-up to Ic53d290431fcabce9607685a6eca45063fea0c9a Change-Id: I28094ce9744838a1ab859470b22714d539ee8f4c
| * | | am 5863e75e: Ensure we chipify the original textScott Kennedy2013-03-051-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '5863e75e34f565429bd943af692d2fa104441901': Ensure we chipify the original text
| * | | | Revert an unnecessary changeScott Kennedy2013-03-052-24/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I5e9631f258b8d273777c65f3f5460f1aa71f10b1 no longer appears to be necessary, and was causing jank. It was effectively reverted in Gmail UR8, and this change just removes the remaining code. Bug: 8316009 Change-Id: I9c1309cccf57a1e6e7d75eb017aa09add57d2c4a
| * | | | Ensure appended emails have a comma separatorScott Kennedy2013-03-051-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was some code that checked for comma placement, but that is no longer necessary. Instead, we verify that the email address has a trailing comma (plus optional whitespace), and if not, we append a comma and space, to ensure the address is later chipified correctly. Bug: 8272316 Change-Id: Ifbb1bae466e3ae15c39d6b90a4bc22edc72a096f
| * | | | am 0159508d: Merge "Fix some jank" into jb-ub-mail-ur8Scott Kennedy2013-03-041-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '0159508d07186a3bf9fcc9a7227047f1bd82084d': Fix some jank
| * \ \ \ \ am 48ad5213: Fix NPE.Alice Yang2013-03-041-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '48ad5213e18a67b3a7ec3375214e3900240b889c': Fix NPE.
| * \ \ \ \ \ am c4d46df7: Fix NPE.Alice Yang2013-03-041-2/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c4d46df70d525cb2289bd76fb0b0b12637dbbe23': Fix NPE.
| * \ \ \ \ \ \ am 211ae635: Reduce chip jankScott Kennedy2013-02-274-67/+112
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '211ae63525c02ec914ef020af625ea4e7d8a3b29': Reduce chip jank
| * \ \ \ \ \ \ \ am 8c386766: Use the best contact result for chipsScott Kennedy2013-02-251-2/+68
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8c3867660cd9e2ebb34e5efc62aecdad76a65c6d': Use the best contact result for chips
| * \ \ \ \ \ \ \ \ am 2727f969: Ensure all addresses turn into chipsScott Kennedy2013-02-192-5/+54
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2727f969d0ce46cdd16cd77e1dc21f3a636217d2': Ensure all addresses turn into chips
| * \ \ \ \ \ \ \ \ \ am 7b1c6d7d: Add a toString() to make debugging easierScott Kennedy2013-02-151-0/+5
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7b1c6d7dea5f4e3fcb3eb4f137b2e510b394ea79': Add a toString() to make debugging easier
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 11:32:25 +0000