summaryrefslogtreecommitdiffstats
path: root/chips/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Eliminate jank when the user deletes a character thereby removing all ↵mindyp2012-12-171-1/+1
| | | | | | | | | | | | | | | | contact results in the popup. part of b/7727257] Jank when replying to or forwarding a message in gmail Change-Id: If95716847260d802e527a4ad012ea7f8085d6930
* | Scroll when result of a contacts lookup appearmindyp2012-12-142-13/+80
| | | | | | | | | | Fixes b/7727257 Jank when replying to or forwarding a message in gmail Change-Id: I620fb31adcb80ca7a6a86c64c987969bc630429d
* | Merge remote-tracking branch 'goog/jb-ub-mail' into gmailmergePaul Westbrook2012-11-191-12/+9
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: chips/src/com/android/ex/chips/RecipientEditTextView.java Change-Id: I160582b77ead921df187bdcf41a1f53cd0d5e425
| * | Reduce time until first revision of a chip is drawn.mindyp2012-11-091-8/+5
| | | | | | | | | | | | | | | | | | | | | Means less time showing plain text. replace call is expensive. Change-Id: I1be571af78497c2dfff724b612d60ededc98ff36
| * | dont replace the text in the text field when editing a fake or generated entrymindyp2012-11-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | We are editing the entire text in there, and that includes the display name and any other information...so just remove the span This means we dont trigger a text change that triggers a scroll Fixes b/7499873 Odd scroll when touch non-contact chips with quote text enabled Change-Id: I0c537e7fec663abe3cec96a5b59bc52caa009a30
| * | Make sure that we take the existng temporary contact, where available.mindyp2012-11-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Temporary contact entry will give us display name and address if it has it when there is no contact match Fixes part of b/7481045 recipient address briefly drawn w/o friendly name Change-Id: Id5cf6b770d1179c81d9c9b808af4681e632d18a7
| * | Make sure that the last "fake entry" chip is correctly committedmindyp2012-11-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix logic to correctly determine that this "recipient chip" is really text Fixes part of b/7481045 recipient address briefly drawn w/o friendly name Change-Id: I4c5244581a4fce5de58d6d9c510e1df16674c338
| * | Update chips to follow new ux spec for replacementmindyp2012-11-071-30/+78
| | | | | | | | | | | | | | | | | | Part of b/7481045 recipient address briefly drawn w/o friendly name Change-Id: I2f3c63f555143c66b3d4f466b60e0ca884d6302b
| * | Reset maxlines when the user expands textmindyp2012-11-061-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid an initial jump when changing over a possibly large numbers of contacts to chips, start with maxlines of 2 from some apps, and eliminate this when the user chooses to expand. Part of b/7481045 recipient address briefly drawn w/o friendly name Change-Id: I5c8cd5c1569befa28a67ddb1f4153e03e896c25a
| * | Show old resultsPaul Westbrook2012-10-251-5/+36
| | | | | | | | | | | | | | | | | | | | | | | | Keep showing old recipient results when no local results are returned, if we are waiting for server results Bug: 7407129 Change-Id: If495ff6437da064206923dc95ee61b7a4f19c2f3
| * | Make sure we check the most up to date text for the token offsets.mindyp2012-10-031-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue here was that we were using the old version of the editable string (cached in var text) to look for the start/end of tokens, but the result of calling commitChip may have updated the text (added corrective rfc822 formatting, or a display name) Fixes b/7268603 [Manta] List of email addresses pasted into the To field is broken Change-Id: Iccc8dbf78a018c84fd818582d10ff2b02a787276
| * | Add comments to the recipientedittextview replace code.mindyp2012-10-011-0/+3
| | | | | | | | | | | | | | | | | | makes it easier for others to debug/ review Change-Id: Icdcbaa9074c81ef33943b24e8e0b544513360d8a
| * | Fix crashes associated with new logic to replace entire address with name + ↵mindyp2012-09-291-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | address Fixes b/7257614 crash when replying to a message Change-Id: I6dcda376073f941fba4b09a647bdb00a92e4ccce
* | | SMS text messaging omits numbers in parenthesesTom Taylor2012-11-151-1/+11
| |/ |/| | | | | | | | | | | | | | | | | Bug 7355280 Very localized fix. Tweak the phone number matching pattern to handle a "1" before parens. This change was originally incorporated in MR1, but wiped out by some automerger change. Bringing the change back for MR1.1. Change-Id: Ifd11762fb7253fab69ca912dff6b62c5673bf216
* | Merge changes to chips from unbundled branch: update behavior to match new ↵mindyp2012-11-071-73/+86
| | | | | | | | | | | | | | | | ux spec Fixes part of b/7481045 recipient address briefly drawn w/o friendly name Change-Id: I523b960fd044f054ec32befc10599d4d0e485eaf
* | cherrypick: Reset maxlines when the user expands textmindyp2012-11-061-2/+5
| | | | | | | | | | | | | | | | | | To avoid an initial jump when changing over a possibly large numbers of contacts to chips, start with maxlines of 2 from some apps, and eliminate this when the user chooses to expand. Part of b/7481045 recipient address briefly drawn w/o friendly name Change-Id: I5c8cd5c1569befa28a67ddb1f4153e03e896c25a
* | Show old resultsPaul Westbrook2012-10-251-5/+36
| | | | | | | | | | | | | | | | | | | | Keep showing old recipient results when no local results are returned, if we are waiting for server results cherry-pick of https://googleplex-android-review.googlesource.com/#/c/246005/ Bug: 7407129 Change-Id: If495ff6437da064206923dc95ee61b7a4f19c2f3
* | SMS text messaging omits numbers in parenthesesTom Taylor2012-10-161-1/+11
| | | | | | | | | | | | | | | | | | Bug 7355280 Very localized fix. Tweak the phone number matching pattern to handle a "1" before parens. Change-Id: I67d878145fbc0b0ac17197043ea84f68e52b8156
* | cherrypick: Make sure we check the most up to date text for the token offsets.mindyp2012-10-031-5/+5
| | | | | | | | | | | | | | | | | | | | | | The issue here was that we were using the old version of the editable string (cached in var text) to look for the start/end of tokens, but the result of calling commitChip may have updated the text (added corrective rfc822 formatting, or a display name) Fixes b/7268603 [Manta] List of email addresses pasted into the To field is broken Change-Id: Iccc8dbf78a018c84fd818582d10ff2b02a787276
* | cherrypick: Fix crashes associated with new logic to replace entire address ↵mindyp2012-10-011-4/+4
| | | | | | | | | | | | | | | | with name + address Fixes b/7257614 crash when replying to a message Change-Id: I6dcda376073f941fba4b09a647bdb00a92e4ccce
* | am 215b1c80: The "original text" is just what we are putting in the text ↵mindyp2012-09-251-1/+1
|\| | | | | | | | | | | | | view, which is displaytext * commit '215b1c80111ccc8d42256fa8f38f3d00e0171cf2': The "original text" is just what we are putting in the text view, which is displaytext
| * The "original text" is just what we are putting in the text view, which is ↵mindyp2012-09-251-1/+1
| | | | | | | | | | | | | | | | displaytext Fixes b/7233276 Crash at clicking Email - ReplyAll on Manta Change-Id: Icd5e2c0c2afb625a6b181592b2da27a008266a33
* | am b6641931: Make sure when we reverse lookup a recipient, we replace the ↵mindyp2012-09-241-2/+6
|\| | | | | | | | | | | | | underlying text string as well. * commit 'b6641931653e19766025820fb78c7142e597545e': Make sure when we reverse lookup a recipient, we replace the underlying text string as well.
| * Make sure when we reverse lookup a recipient, we replace the underlying text ↵mindyp2012-09-241-2/+6
| | | | | | | | | | | | | | | | string as well. Fixes b/7146034 Conversation message header doesn't show friendly names Change-Id: I043d352e1c6546e5a8c07854e832f31c3a71d24d
* | am 6c668476: We add the separator ourselves later if it wasnt specified in ↵mindyp2012-09-101-4/+1
|\| | | | | | | | | | | | | append. * commit '6c66847624945b3caca9607c61669f4766e7f39e': We add the separator ourselves later if it wasnt specified in append.
| * We add the separator ourselves later if it wasnt specified in append.mindyp2012-09-101-4/+1
| | | | | | | | | | | | Fixes b/7137725 Attendees are lost after editing Change-Id: I48cecde9e5e2e9e8648393c8b71e6911cd1cbc9f
* | am 3aa118e7: Be extra careful with commas in recipient chipsmindyp2012-09-101-6/+10
|\| | | | | | | | | * commit '3aa118e72c877b4c176d025c56bfad2e518bf1ce': Be extra careful with commas in recipient chips
| * Be extra careful with commas in recipient chipsmindyp2012-09-101-6/+10
| | | | | | | | | | | | | | | | | | Fixes b/7132543 email addresses not recognized when using Gmail ICS I added 2 in a row to be extra certain, and always check for the LAST instance of "," Change-Id: Id963971303a99642865a79c6264264e62a920151
* | am 26e3f68a: Deal with commas within quoted textmindyp2012-08-271-3/+16
|\| | | | | | | | | * commit '26e3f68ae8342cedd57353e399e7d0e920228a4e': Deal with commas within quoted text
| * Deal with commas within quoted textmindyp2012-08-271-3/+16
| | | | | | | | | | | | | | | | If there is a comma within quoted text, it is NOT a chip ending token Fixes b/7001805 Names appended to email ids like "Mathew, Deepthi E" are split into two chips while replying Change-Id: I87f34a44282b3baf8d106dd21f8211ad301395be
| * Merge change from jb-dev to masterMindy Pereira2012-07-161-1/+1
| | | | | | | | | | | | | | | | | | This is the change that fixes the random scrolling when switching between reply/reply all Merge of: https://android-git.corp.google.com/g/#/c/203483/1 Change-Id: I6b11016b4f48b297a2c6c40413cf6d6a52a193b4
* | am 1a71f76d: Check for null adapter.Mindy Pereira2012-06-281-2/+3
|\| | | | | | | | | * commit '1a71f76db0880a572b1443e8a0ac31a4bb584a8b': Check for null adapter.
| * Check for null adapter.Mindy Pereira2012-06-281-2/+3
| | | | | | | | | | | | | | | | If its not set, that would cause this crash in the monkey. Fixes b/6746348 java.lang.NullPointerException at com.android.ex.chips.RecipientEditTextView.isPhoneQuery(RecipientEditTextView.java:2574) Change-Id: I420bbae15180d0d53c674b00907bc361a519c165
* | Area code truncated for the phone number in messaging appTom Taylor2012-06-251-4/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6717762 When launching mms from the contacts app, numbers sometimes get munged, either by losing the area code (if in parens) or losing the number completely and just ending up with a contact name. Parse all the parts of a contact "fred flinstone <512-123-1231>" looking for the phone number. Also handle the case where the area code is lost when in parens (i.e. (800) 891-8923). Change-Id: I76976fa8004c1d7c03a651b3915537245fee16e4
* | Don't scroll when we are clearing text.Mindy Pereira2012-06-251-1/+2
|/ | | | | | | | Only scroll when the user adds text. Fixes b/6696682 Compose email field is out of view after changing from Reply to Reply all for a message Change-Id: I188f9be0b4993edab282256d647501b6734242f7
* Break out of infinite loop once we detect an error.Mindy Pereira2012-06-041-0/+3
| | | | | | Fixes b/6606808 Crash in Gmail {OutOfMemoryError- at android.graphics.Bitmap.nativeCreate(Native Method) } Change-Id: Ic62c15bd59060f552aef5be0cc06e26b56efd462
* Merge "Rather than change the text, just remove the waiting for entries ↵Mindy Pereira2012-05-252-72/+45
|\ | | | | | | row." into jb-dev
| * Rather than change the text, just remove the waiting for entries row.Mindy Pereira2012-05-252-72/+45
| | | | | | | | | | | | | | Fixes b/6546713 Blank suggestion is sometimes shown even if nothing was typed per ux Change-Id: I5c6d1f6620426bd96abca1bad650663ab6c5c426
* | Merge "The mysterious blank item was just a mis-used layout" into jb-devMindy Pereira2012-05-251-1/+1
|\|
| * The mysterious blank item was just a mis-used layoutMindy Pereira2012-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | Was expecting the chips_waiting_for_directory_search layout But was given the chips_recipient layout Fixed this to use the correct layout fixes b/6546713 Blank suggestion is sometimes shown even if nothing was typed that's at least part of the problem why it shows up "uninvited" is another question Change-Id: Ie60b9ae8f7f86dda4316fee43b3983fbe0f17cb0
* | Merge "Dont hide the keyboard when showing alternates/ selecting a chip." ↵Mindy Pereira2012-05-241-13/+1
|\ \ | |/ |/| | | into jb-dev
| * Dont hide the keyboard when showing alternates/ selecting a chip.Mindy Pereira2012-05-241-13/+1
| | | | | | | | | | | | Fixes b/5557044 Chips replace-email-window shouldn't close the keyboard Change-Id: I93829983346de77ee79dd602ae84152d262ce01d
* | Merge "Null check; back behavior" into jb-devMindy Pereira2012-05-242-10/+13
|\|
| * Null check; back behaviorMindy Pereira2012-05-242-10/+13
| | | | | | | | | | | | | | | | | | | | | | Since its possible there was no chip formed for an address, it is possible there is no address in some part of the inAddresses array, so build it up as an arraylist so we don't have null spots. Fixes b/6555471 NPE in com.android.ex.chips.RecipientAlternatesAdapter.getMatchingRecipients Fixes b/6556107 when contact chip is selected back button should dismiss the popup and unselct the chip Change-Id: If74b13ccc5f51aafc3638817b5fbef54cd57548c
* | Fix offset of alternates list dropdown.Mindy Pereira2012-05-231-1/+10
| | | | | | | | | | | | Fixes b/6546711 Chips suggestion is below selected chip Change-Id: I14821855b510b30e8eb4798eb4cc4a9c69f4dca9
* | Try this out with experimenters to see if the scrolling is reasonable.Mindy Pereira2012-05-231-0/+8
|/ | | | | | | | It seems that what annoyed arubin was that focusing the item changed the scroll position So I am now just changing it when the user actually starts entering text Change-Id: I8868cde2fc90b1e253c50fd3fad900f811442e6d
* Change text on "done" to say "return"Mindy Pereira2012-05-091-0/+1
| | | | | | Fixes b/6468243 While adding chips to the To field display label "Return" instead of "Done" Change-Id: I42f9a845c553f0aa01971c5b3221ce5d0504c810
* Use ALIGN_BOTTOM instead of ALIGN_BASELINEMindy Pereira2012-05-071-1/+1
| | | | | | | This certainly looks better Fixes b/6369828 When there are 2 chips/labels stacked top one is compressed Change-Id: I345bd5feec16a5d9352d4ad20dfb9725d76bb208