summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix plus sign on number dropdowncm-12.1Martin Brabham2015-11-201-0/+21
* Merge "Revert "More Chip: use pendingcount instead of counting again"" into c...Danesh M2015-09-011-1/+1
|\
| * Revert "More Chip: use pendingcount instead of counting again"Danesh M2015-07-311-1/+1
* | chips: extend phone number regex to recognize russian trunk prefixemancebo2015-08-051-3/+3
* | Fix exception that crashes app when <<>> chip is clicked onYvonne Wong2015-08-031-1/+7
* | Merge "More Chip: use pendingcount instead of counting again" into cm-12.1Stephen Bird2015-07-272-4/+19
|\|
| * More Chip: use pendingcount instead of counting againStephen Bird2015-07-211-1/+1
| * Merge remote-tracking branch 'caf/LA.BR.1.2.3' into HEADMatt Garnes2015-05-040-0/+0
| |\
| | * Merge "Chips: Add a view attribute for maximum number of chips parsed"Linux Build Service Account2015-04-082-2/+30
| | |\
| | | * Chips: Add a view attribute for maximum number of chips parsedRaj Yengisetty2015-04-082-2/+30
| | |/
| * | Chips: Add a view attribute for maximum number of chips parsedRaj Yengisetty2015-04-072-2/+30
| * | Merge remote-tracking branch 'caf/LA.BR.1.2.3' into caf/cm-12.1Matt Garnes2015-03-262-2/+2
| |\|
| | * Merge commit into AOSP_MERGENatiq Ahmed2015-03-102-2/+2
| | |\
| * | | Merge CAF branch 'caf/LA.BR.1.2.1_rb2.17' into caf/cm-12.0.Matt Garnes2015-02-130-0/+0
| |\| |
| | * | Merge "Chips: Fix some crashes and missing default icon scenario"Linux Build Service Account2015-02-022-10/+14
| | |\ \
| | | * | Chips: Fix some crashes and missing default icon scenariolinus_lee2015-01-302-10/+14
| | * | | Merge "Chips: Add more logic to dismiss selection dialog"Linux Build Service Account2015-02-021-2/+4
| | |\| |
| | | * | Chips: Add more logic to dismiss selection dialoglinus_lee2015-01-301-2/+4
| | |/ /
| * | | Merge CAF branch 'LA.BR.1.2.1_rb2.12' into caf/cm-12.0.Matt Garnes2015-01-292-3/+18
| |\| |
| | * | Merge "Chips: Google Pinyin input method"Linux Build Service Account2015-01-221-0/+11
| | |\ \
| | | * | Chips: Google Pinyin input methodUday Kiran jandhyala2015-01-161-0/+11
| | |/ /
| | * | Merge "Mms: Fix FC when tapping recipient chip in mms."Linux Build Service Account2015-01-091-4/+8
| | |\ \
| | | * | Mms: Fix FC when tapping recipient chip in mms.kaiyiz2014-12-311-4/+8
| | |/ /
| * | | Chips: Add more logic to dismiss selection dialoglinus_lee2015-01-291-2/+4
| * | | Chips: Fix some crashes and missing default icon scenariolinus_lee2015-01-293-11/+15
| * | | Always trim destination.Danny Baumann2015-01-081-2/+2
| * | | Chips : Fix recipient list picked contactDanesh M2015-01-086-11/+34
| |/ /
* | | Apply anti-aliasing when drawing chips.Matt Garnes2015-06-221-0/+1
* | | Chips: Add a view attribute for maximum number of chips parsedstable/cm-12.1-YOG3CRaj Yengisetty2015-04-072-2/+30
* | | chips: fix NPE errorsstaging/cm-12.1Jorge Ruesga2015-03-232-14/+35
* | | chips: suggested contactsJorge Ruesga2015-03-2319-13/+664
* | | Merge tag 'android-5.1.0_r1' into HEADRicardo Cerqueira2015-03-102-2/+2
|\ \ \ | | |/ | |/|
| * | am 19fac962: (-s ours) am 966b3500: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| |\ \
| | * | am 966b3500: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| |/| | | | |/
* | | Chips: Add more logic to dismiss selection dialogstable/cm-12.0-YNG1Ilinus_lee2015-01-281-2/+4
* | | Chips: Fix some crashes and missing default icon scenariolinus_lee2015-01-263-11/+15
* | | Chips : Fix recipient list picked contactDanesh M2015-01-076-11/+34
* | | Always trim destination.Danny Baumann2014-12-031-2/+2
| |/ |/|
* | Import translations. DO NOT MERGEstaging/cm-12.0-cafBaligh Uddin2014-10-192-2/+2
|/
* Import translations. DO NOT MERGEBaligh Uddin2014-08-2420-22/+20
* reset to 049af32 with historyQiwen Zhao2014-08-200-0/+0
|\
| * Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-1916-352/+0
* | Remove unnecessary font metrics callJin Cao2014-08-181-3/+0
* | [Quantum chips] change chips into ReplacementSpanJin Cao2014-08-186-64/+98
* | Merge "Allow to paste text or html into a chip" into ub-chips-cranbrookRégis Décamps2014-08-152-14/+69
|\ \
| * | Allow to paste text or html into a chipRégis Décamps2014-08-142-14/+69
* | | Import translations. DO NOT MERGEBaligh Uddin2014-08-1155-55/+57
|/ /
* | [Quantum chips] code cleanup and restylingJin Cao2014-08-1019-113/+53
* | am 4e2adeac: Remove instance of @+android:id/...Scott Kennedy2014-08-091-1/+1
|\ \
| * | Remove instance of @+android:id/...Scott Kennedy2014-08-081-1/+1