summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Use darker cancel button for all dpis.Andrew Sapperstein2014-03-273-0/+0
| | | | | | | | | | | | | | | | | | | | b/11049535 Originally from Id1b6ceb3a9d440e7ec01e85c06ace8d2e9fd2cec Got lost in earlier merges. Bug: 13653397 Change-Id: I974a0afda5829dd220ff9f90bbffdac66af3c3b5
| * Update conv list pressed state assetsMindy Pereira2014-03-274-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Now, more contrast! Fixes b/10993365 investigate holo_dark vs holo_light in gmail Originally from Ic2218564d87cd524ed4dd45bf50ffecc77de0724 Got lost in earlier merges. Bug: 13653397 Change-Id: I0a85e6c809471c6f2940ec5d0ab1b052dc7cabf8
| * Few more de-blued assetsMindy Pereira2014-03-278-0/+0
| | | | | | | | | | | | | | | | Originally from I2d91bdeab51b81ee598a254a783e09ab625d616e Got lost in earlier merges. Bug: 13653397 Change-Id: Id3483cad2f35c10d787aac6b5b0eb5b39b7deb8c
| * De-blue email pressed statesMindy Pereira2014-03-277-0/+84
| | | | | | | | | | | | | | | | | | Originally from If85602cbf809e0cdce7246135d7f428037a10453 Got lost in earlier merges. Bug: 13653397 Change-Id: Ic8a343a33f8866b59ce2ea6f9670e7c9d5f13355
| * keep history after reset to ub-mail-klp-mr2-release@1078484Baligh Uddin2014-03-200-0/+0
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2014-02-206-8/+8
| | | | | | | | | | | | | | | Change-Id: Id177737c4de1286a9013d2a312260c8951d3744b Auto-generated-cl: translation import
| | * Import translations. DO NOT MERGEBaligh Uddin2014-01-061-1/+1
| | | | | | | | | | | | | | | Change-Id: I07b3b719a8242a4ba3524aa7a450e07e5c921394 Auto-generated-cl: translation import
| | * Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-12-191-1/+1
| | |\
| | | * Import translations. DO NOT MERGEBaligh Uddin2013-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I705b6c2aebe0148ffeac82c228ccf87aad88b388 Auto-generated-cl: translation import
| | * | am 4f8fc679: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-12-190-0/+0
| | |\ \ | | | |/ | | |/| | | | | | | | | * commit '4f8fc67976ff8b5d467d2c72ddc22c2cca9c3ebf': Import translations. DO NOT MERGE
| | * | am bb768692: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-12-120-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'bb768692e9cd5241ae08ee4f045b4f5158321b13': Import translations. DO NOT MERGE
| | * | | Import translations. DO NOT MERGEBaligh Uddin2013-12-115-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id098edcc7512758c8e1f66d11d471aff3abcd047 Auto-generated-cl: translation import
| * | | | merge in ub-mail-klp-mr2-release history after reset to ub-mail-klp-mr2The Android Automerger2014-03-100-0/+0
| |\ \ \ \
| | * \ \ \ merge in ub-mail-klp-mr2-release history after reset to ub-mail-klp-mr2The Android Automerger2014-03-040-0/+0
| | |\ \ \ \
| | | * \ \ \ merge in ub-mail-klp-mr2-release history after reset to ub-mail-klp-mr2The Android Automerger2014-02-270-0/+0
| | | |\ \ \ \
| | | | * \ \ \ merge in ub-mail-klp-mr2-release history after reset to ub-mail-klp-mr2The Android Automerger2014-02-270-0/+0
| | | | |\ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | | * | | Merge "Import translations. DO NOT MERGE" into ub-mail-masterBaligh Uddin2014-02-2756-1/+170
| | | | | |\ \ \
| | | | | | * | | Import translations. DO NOT MERGEBaligh Uddin2014-02-2656-1/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2d4b80fe33d9cd2c3baa4b96a33dcf98d72a891e Auto-generated-cl: translation import
| | | | | * | | | Disable disable some PII loggingPaul Westbrook2014-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13206685 Change-Id: I6f4f92a478530876c2efeb176c9ea0b238512cce
| | | | | * | | | small refactorAndy Huang2014-02-264-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wet -> dry Change-Id: Iccb44b3156d5a38d6f3d0ddfee5b8d21f00c98cd
| | | | | * | | | Merge "Make drawer available in Search and ConversationView" into ub-mail-masterMartin Hibdon2014-02-264-30/+109
| | | | | |\ \ \ \ | | | | | | |/ / / | | | | | |/| | |
| | | | | | * | | Make drawer available in Search and ConversationViewMartin Hibdon2014-02-264-30/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/8737446 This is more complicated to do correctly than it seems like it should be: When we are viewing search results, there is actually a separate activity instance on top of the main conversation list activity. This is true for both one and two pane layouts. So now, when we launch the search activity, we do it with startActivityForResult. If the result is set upon return, then the parent activity will know to navigate to a different folder or account. Change-Id: I5b780c4ce5bb0a1e55364cc4df280346900c5df5
| | | | | * | | | Merge "Better fix for displaying add/remove star in actionBar" into ↵Martin Hibdon2014-02-262-3/+15
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ub-mail-master
| | | | | | * | | | Better fix for displaying add/remove star in actionBarMartin Hibdon2014-02-252-3/+15
| | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I10dc1ab21f1be73b8e8d38c42d668c5c60533dda
| | | | | * | | | Merge "Make changeAccount protected and add strings." into ub-mail-masterAndrew Sapperstein2014-02-262-1/+5
| | | | | |\ \ \ \ | | | | | | |/ / / | | | | | |/| | |
| | | | | | * | | Make changeAccount protected and add strings.Andrew Sapperstein2014-02-242-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/12552407. Change-Id: If030a27b1ff1577cc84067b9e1222c8008268dee
| | | | | * | | | Merge "Move the add/remove star item out of the overflow" into ub-mail-masterMartin Hibdon2014-02-257-2/+4
| | | | | |\ \ \ \
| | | | | | * | | | Move the add/remove star item out of the overflowMartin Hibdon2014-02-257-2/+4
| | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This addresses one of our UX compliance issues Change-Id: Ia8f302cd21b03811a1f009dddd782e5f48deafb6
| | | | | * / / / Import translations. DO NOT MERGEBaligh Uddin2014-02-243-11/+11
| | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I17e959a38b591661e843c884399ffe665203b1d3 Auto-generated-cl: translation import
| | | | | * | | Convert tests to use android-support-test.Brett Chabot2014-02-202-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia1525904c8bd669305f72c6c1973cc0365ca1251
| | | | | * | | Merge "fix missing message text processing upon send (and as drafts mutate)" ↵Andy Huang2014-02-214-7/+25
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into ub-mail-master
| | | | | | * | | fix missing message text processing upon send (and as drafts mutate)Andy Huang2014-02-194-7/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix message body processing when transitioning through the send flow. Previously, the message text was largely unprocessed, but it wasn't obvious like it is now with 980px viewports. Also move 'table-cell' wrapping from inside the message template to Java code so the in-place body replacement that happens during send can also use it. Bug: 13079016 Change-Id: I9a6a801c43b76c1714dfd2c8b41649fa6b9e90c8
| | | | | * | | | am cd37700d: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-02-200-0/+0
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cd37700de84d8f5b0fb7c26a035917aa0bbc8f7f': Import translations. DO NOT MERGE
| | | | | | * | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-205-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3c4e0637ace1c5eb70d2fe41606860f06bb34b45 Auto-generated-cl: translation import
| | | | | * | | | | am 6fb4bdad: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-02-200-0/+0
| | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6fb4bdad1dc005ff24312d2cb32a868ecc67c4e3': Import translations. DO NOT MERGE
| | | | | | * | | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-206-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I310c42ae794b28b2b680566d9e956dd03649bf6f Auto-generated-cl: translation import
| | | | | * | | | | | Merge "Import translations. DO NOT MERGE" into ub-mail-masterBaligh Uddin2014-02-2032-288/+148
| | | | | |\ \ \ \ \ \
| | | | | | * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-2032-288/+148
| | | | | | | |_|/ / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7972321b67d96744b4be6a3780a0052229bd01b2 Auto-generated-cl: translation import
| | | | | * | | | | | Merge "Fix compose message cursor placement" into ub-mail-masterTony Mantler2014-02-201-8/+8
| | | | | |\ \ \ \ \ \
| | | | | | * | | | | | Fix compose message cursor placementTony Mantler2014-02-201-8/+8
| | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Place the cursor in front of the signature when it's appended, regardless of whether the text area is focused. The signature gets (re)-appended in two cases: 1: When we initially set up the compose activity and 2: When we change accounts In neither of these cases do we generally expect the body text area to be focused, so the code to set the cursor ahead of the signature was basically never being run. This meant that when you tabbed into the body text area (hit "Next" on the IME or whatever) the cursor would be placed at the end of the text after the signature rather than, as intended, before the signature. Thus I separated out refocusing the body text area from the cursor positioning, and ran the cursor positioning code unconditionally when the signature changes. b/11355420 Change-Id: I3c29ffb9734ea145eb5c6fcdc202c65669e8e2b3
| | | | | * | | | | | Fix yet another unicodeWrap NPE. b/13108784.Andrew Sapperstein2014-02-201-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5d1df39b8f49641a3a9a8fe9187049a590d820ed
| | | | | * | | | | | Add test size annotation to test classes so they get run in continuousJerry Xie2014-02-193-1/+7
| | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I58e8aa7ed455e9901abfc0a4d6b0874826013090
| | | | | * | | | | Merge "Warnings and finals" into ub-mail-masterTony Mantler2014-02-191-73/+69
| | | | | |\ \ \ \ \
| | | | | | * | | | | Warnings and finalsTony Mantler2014-02-191-73/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1f6b3b2170a430dfb32bc8b74b4265257edb0571
| | | | | * | | | | | Merge "Make sure that no null values are placed into the notification map." ↵Anthony Lee2014-02-181-12/+52
| | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ub-mail-master
| | | | | | * | | | | | Make sure that no null values are placed into the notification map.Anthony Lee2014-02-181-12/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Motorola IKVPREL1KK-3183. Their patch alludes to the fact that they have hit a situation where there is a valid key but the value associated with that key in the map was null. As a response, this change will change the relationship with the ConcurrentHashMap from an is-0 to a has-a to tightly control the interface into this class and force that all puts go through a function that always allocates an object before inserting into the map. Change-Id: I1cc100773ba3a7b09edc59fee20e6cc14b5053f8
| | | | | * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-1756-56/+424
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I22ddb0e7c965e5cc41b28f6d9e6cbefaf9c03989 Auto-generated-cl: translation import
| | | | | * | | | | | | Adjust padding in spam warning text view.Venkat2014-02-151-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mock: https://folio.googleplex.com/royshin/Gmail/UR12/Spam/020714_redlines/#/C_redlines_01.png?z=fit Change-Id: I7e6460c3558c250374fbfa8fe5aca4535fdf856e
| | | | | * | | | | | | Adjusting spam warning banner as per the mock.Venkat2014-02-1424-105/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I86d673cb2b08fb40c3eb715ec3b92de4f7357fb5 Conflicts: res/values/dimen.xml
| | | | | * | | | | | | Merge "Fancier empty states. Fixes b/9730911." into ub-mail-masterAndrew Sapperstein2014-02-1491-147/+235
| | | | | |\ \ \ \ \ \ \ | | | | | | |_|/ / / / / | | | | | |/| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 23:54:43 +0000