summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add UX assets for the Material-compatible search icon" into ↵James Lemieux2014-06-1715-6/+6
|\ | | | | | | ub-mail-master
| * Add UX assets for the Material-compatible search iconJames Lemieux2014-06-1715-6/+6
| | | | | | | | | | | | | | | | Note that ic_menu_search_holo_light.png is renamed to ic_menu_search.png as a byproduct of this change. It is then overlayed in -v21 folders so the new icon only applies to L and beyond. Change-Id: I82dd4642faa872833b159d6f89964303284d985d
* | Merge "Adjust colors of timestamp in conversation list" into ub-mail-masterJames Lemieux2014-06-171-1/+2
|\ \
| * | Adjust colors of timestamp in conversation listJames Lemieux2014-06-171-1/+2
| |/ | | | | | | | | | | | | The timestamp is blue if unread messages exist in the conversation and light gray otherwise. Change-Id: Ie7d2664ff729c66715d06463603e9411923fee0c
* | Unify general settingsTony Mantler2014-06-172-11/+4
| | | | | | | | | | | | | | | | | | | | Add mechanism for Email to subclass General Prefs, to remove archive-related prefs Also tidy up some resources b/9566150 Change-Id: I7f367302dd8c62102e227800bc7bf037d38fb788
* | Move GeneralPrefsFragment to UnifiedEmailTony Mantler2014-06-166-1/+207
|/ | | | | | b/9566150 Change-Id: I016708a04aebcaa3b95960a9dc9f74bf4efea823
* Merge "Move all general prefs values to UnifiedEmail" into ub-mail-masterTony Mantler2014-06-122-0/+44
|\
| * Move all general prefs values to UnifiedEmailTony Mantler2014-06-132-0/+44
| | | | | | | | | | | | b/9566150 Change-Id: Idd4510e7c4be598795ed92b0bd903e455edf670b
* | Merge "Import translations. DO NOT MERGE" into ub-mail-masterBaligh Uddin2014-06-1217-92/+47
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2014-06-1317-92/+47
| |/ | | | | | | | | Change-Id: If6b476781627529da000161fb7c9b404b1ddfb71 Auto-generated-cl: translation import
* / Add support for public notificationsJames Lemieux2014-06-131-1/+4
|/ | | | | | | | Public notifications are redacted forms of private notifications that can safely be displayed above a user's lock screen without displaying sensitive information to unauthorized parties. Change-Id: Ibef0dfed3580de052dbda74829f4bd565b878369
* Material up arrow on compose, v21Andy Huang2014-06-111-2/+3
| | | | Change-Id: I73ca4e25dfdaa5254f31d334ae159bfc6ad70b80
* Merge "Import translations. DO NOT MERGE" into ub-mail-masterBaligh Uddin2014-06-1056-187/+232
|\
| * Import translations. DO NOT MERGEBaligh Uddin2014-06-0956-187/+232
| | | | | | | | | | Change-Id: Ice0efd225dff7e8e1e34e613819e03e1f69334c4 Auto-generated-cl: translation import
* | s/Quantum/Material/gAndy Huang2014-06-073-22/+22
|/ | | | Change-Id: Ief8b545f9575a523a3411c07640dd8421bca77da
* Merge "Import translations. DO NOT MERGE" into ub-mail-masterBaligh Uddin2014-06-0715-49/+39
|\
| * Import translations. DO NOT MERGEBaligh Uddin2014-06-0415-49/+39
| | | | | | | | | | Change-Id: I99ccd7af4ae1c39a711439a841f44b6addeabf56 Auto-generated-cl: translation import
* | am 9e6156e3: Merge "Modify canned responses used for replying email on ↵Alan Lau2014-06-061-1/+4
|\ \ | | | | | | | | | | | | | | | | | | Wear." into ub-gmail-ur13-dev * commit '9e6156e36f6076d869a036f8a719b32f924ae2b9': Modify canned responses used for replying email on Wear.
| * \ Merge "Modify canned responses used for replying email on Wear." into ↵Alan Lau2014-06-061-1/+4
| |\ \ | | | | | | | | | | | | ub-gmail-ur13-dev
| | * | Modify canned responses used for replying email on Wear.Alan Lau2014-06-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Bug 15421940 Change-Id: If9c463b813e82d85d9cdbf91b4b23a8cea8f8d45
* | | | am 0509cbc4: Merge "Add "Send anyway" and create a bidi\'ed join method" ↵Andrew Sapperstein2014-06-061-4/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | into ub-gmail-ur13-dev * commit '0509cbc4630eecd02434c30e21f4e7ae226293ca': Add "Send anyway" and create a bidi'ed join method
| * | | Add "Send anyway" and create a bidi'ed join methodAndrew Sapperstein2014-06-051-4/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Creates a StringUtils class that contains two versions of a method called joinAndBidiFormat. It works like TextUtils.join but also unicodeWraps each token before adding to the string. Change-Id: I0bff8c0f3e56c94c92eed8e4a4ae4ba67137d130
| * | Merge "Import translations. DO NOT MERGE" into ub-gmail-ur13-devBaligh Uddin2014-06-0456-414/+338
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2014-06-0256-414/+338
| | | | | | | | | | | | | | | | | | | | Change-Id: I9d946c77cac04e69c15facb444bc9f5ca3b187a6 Auto-generated-cl: translation import
* | | | poor man's Quantum UIAndy Huang2014-06-056-13/+149
| |_|/ |/| | | | | | | | Change-Id: Iec4e6953ef3c780499af46462464b6a275fd6aa8
* | | Merge "Import translations. DO NOT MERGE" into ub-mail-masterBaligh Uddin2014-06-0456-414/+338
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2014-06-0256-414/+338
| | | | | | | | | | | | | | | | | | | | Change-Id: I6df59b11f7cef953eaffe9fc9462406912dad795 Auto-generated-cl: translation import
* | | | resolved conflicts for merge of 5315954c to ub-mail-masterAndy Huang2014-06-033-0/+13
|\ \ \ \ | |/ / / |/| / / | |/ / Change-Id: Ic27dac533aab050497d111234aaac016796b47a5
| * / support for subclass custom attachment handlingAndy Huang2014-06-033-0/+13
| |/ | | | | | | | | | | | | Aslo add some support for open-ended body pre- and post-processing. Bug: 12787313 Change-Id: Ie2aeb9f5cf1e10f9e21a3bd1cc2e1db489319b7f
* | am 6a2df258: Provider support for different sending states for messagesJin Cao2014-05-302-0/+8
|\| | | | | | | | | * commit '6a2df258316b267151296556dbbdba20200ecb1f': Provider support for different sending states for messages
| * Provider support for different sending states for messagesJin Cao2014-05-292-0/+8
| | | | | | | | | | | | | | | | | | Add support at the provider layer to differentiate among different sending states (not sending, sending, retrying, failed). b/9805976 Change-Id: Icb47412ad6f961f36adb6223a6289b0c4dcd7a2c
| * Merge "Import translations. DO NOT MERGE" into ub-gmail-ur13-devGeoff Mendal2014-05-2856-14/+784
| |\
| | * Import translations. DO NOT MERGEGeoff Mendal2014-05-2856-14/+784
| | | | | | | | | | | | | | | Change-Id: I96145801d65115540957e88efbb7315ce21dcd26 Auto-generated-cl: translation import
* | | Merge "Import translations. DO NOT MERGE" into ub-mail-masterGeoff Mendal2014-05-2856-14/+784
|\ \ \
| * | | Import translations. DO NOT MERGEGeoff Mendal2014-05-2856-14/+784
| | | | | | | | | | | | | | | | | | | | Change-Id: I64c709714d7fc8de0d27795ac35ec57d92b796c0 Auto-generated-cl: translation import
* | | | am bcde46cb: Fix comments from previous CL: Move wear icons from hdpi to nodpi.Alan Lau2014-05-282-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'bcde46cb9506331f0817b733d81b590495a26b0e': Fix comments from previous CL: Move wear icons from hdpi to nodpi.
| * | | Fix comments from previous CL: Move wear icons from hdpi to nodpi.Alan Lau2014-05-282-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Bug 13368617 Change-Id: I2a21daf44790b3ffb962c8d925d6b538596ac620
* | | | am 781d1b04: Use wear icons for reply and reply all actions.Alan Lau2014-05-284-0/+0
|\| | | | |/ / |/| | | | | | | | * commit '781d1b0449ecdf74064f42df07e24c7e962c88eb': Use wear icons for reply and reply all actions.
| * | Use wear icons for reply and reply all actions.Alan Lau2014-05-274-0/+0
| |/ | | | | | | | | | | Bug 13368617. Change-Id: Icac31e9672a4f3355d8681bd3019a9da19ffa2b2
| * Merge "Import translations. DO NOT MERGE" into ub-gmail-ur13-devBaligh Uddin2014-05-2756-281/+334
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2014-05-2656-281/+334
| | | | | | | | | | | | | | | Change-Id: I23b689fde6373a6c198a878f2663b701bb440dad Auto-generated-cl: translation import
* | | Merge "Import translations. DO NOT MERGE" into ub-mail-masterBaligh Uddin2014-05-2756-281/+334
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2014-05-2656-281/+334
| | | | | | | | | | | | | | | | | | | | Change-Id: I778e0425833177ca961c36ff63d32e7d45f78df5 Auto-generated-cl: translation import
* | | | am f092a46d: Change char limit of folders header to 20Jin Cao2014-05-271-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'f092a46d1aa82584cb729e0303b325235fd3a920': Change char limit of folders header to 20
| * | | Change char limit of folders header to 20Jin Cao2014-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | b/15178502 Change-Id: I51bc8c23ca55cd1cfd3b10a56d513570a24ee425
* | | | am 7213f2af: Merge "Add reply choices for replying email from wearable." ↵Alan Lau2014-05-271-0/+33
|\| | | | |/ / |/| | | | | | | | | | | | | | into ub-gmail-ur13-dev * commit '7213f2aff2d722022284361812c0c3fdecdccfe4': Add reply choices for replying email from wearable.
| * | Add reply choices for replying email from wearable.Alan Lau2014-05-221-0/+33
| |/ | | | | | | | | | | Bug 14996128 Change-Id: I9e345cdf6e065393771f50834c59fa2f78c23939
* | am 644ec1e2: Set background for wearable only. Use the default image if the ↵Alan Lau2014-05-222-0/+5
|\| | | | | | | | | | | | | icon is not a profile picture. * commit '644ec1e2e65bedbbfff4dbb396d3e4f95d244c62': Set background for wearable only. Use the default image if the icon is not a profile picture.
| * Set background for wearable only. Use the default image if the icon is notAlan Lau2014-05-212-0/+5
| | | | | | | | | | | | | | | | a profile picture. Bug 14092605. Change-Id: Id4c437e91a8f632c1d969ed76be294a8da118b20
* | am c7587faa: Merge "Revert the CLs that updated the message headers." into ↵Andrew Sapperstein2014-05-2226-169/+185
|\| | | | | | | | | | | | | ub-gmail-ur13-dev * commit 'c7587faa5ce3af11cd4a8401d0f2c4b3248d373a': Revert the CLs that updated the message headers.