summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | More chip dropdown fixJin Cao2014-08-081-7/+4
* | | Merge "Don't use textpaint for drawing icons" into ub-chips-cranbrookJin Cao2014-08-071-22/+24
|\ \ \
| * | | Don't use textpaint for drawing iconsJin Cao2014-08-081-22/+24
* | | | Support custom popup anchor in RecipientEditTextViewJin Cao2014-08-083-3/+11
|/ / /
* | | [Quantum chips] support RTL in dropdownJin Cao2014-08-071-0/+2
* | | Merge "Ensure delete listener is set for chips" into ub-chips-cranbrookJin Cao2014-08-062-8/+2
|\ \ \
| * | | Ensure delete listener is set for chipsJin Cao2014-08-062-8/+2
* | | | [Quantum chips] draw chips programmaticallyJin Cao2014-08-0614-38/+40
|/ / /
* | | Merge "Don't use "done" for string name." into ub-chips-cranbrookAndrew Sapperstein2014-08-042-2/+2
|\ \ \
| * | | Don't use "done" for string name.Andrew Sapperstein2014-08-062-2/+2
* | | | [Quantum chips] add custom dividers for autocompleteJin Cao2014-08-066-10/+45
* | | | [Quantum chips] use minHeight for autocomplete dropdownJin Cao2014-08-051-1/+2
* | | | Merge "[Quantum chips] restyle text views" into ub-chips-cranbrookJin Cao2014-07-303-12/+10
|\ \ \ \
| * | | | [Quantum chips] restyle text viewsJin Cao2014-07-313-12/+10
* | | | | Chips show icon even if name is nullJin Cao2014-07-311-2/+1
|/ / / /
* | | | Merge "[Quantum chips] add delete button in dropdown" into ub-chips-cranbrookJin Cao2014-07-299-80/+172
|\ \ \ \
| * | | | [Quantum chips] add delete button in dropdownJin Cao2014-07-319-80/+172
| |/ / /
* / / / Update icon padding for invalid chipsJin Cao2014-07-304-0/+0
|/ / /
* | | [Quantum] update alt/single chips to quantumJin Cao2014-07-298-26/+61
* | | [Quantum chips] restyle recipient chips to quantumJin Cao2014-07-2915-37/+36
* | | [Quantum] chips autocomplete to quantum styleJin Cao2014-07-298-51/+143
* | | Port CircularImageView for chipsJin Cao2014-07-282-3/+104
| |/ |/|
* | Update dropdown assets/layouts for MaterialScott Kennedy2014-07-1012-57/+105
* | Use a better y offset algorithmScott Kennedy2014-07-091-12/+20
* | Update assets/dimensions/defaults to match Material specScott Kennedy2014-07-0919-6/+36
* | am 21386e34: (-s ours) am 5179b9a3: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
|\|
| * am 5179b9a3: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2014-07-052-2/+2