James Lemieux
|
c909ad1654
|
am 826e61c0: am 69ba565b: Merge "Combined view should also display client-side sanitized HTML" into ub-gmail-ur14-dev
* commit '826e61c003e2b2c66865e6b2d62aa0cfa39b5c36':
Combined view should also display client-side sanitized HTML
|
2014-11-02 17:30:04 +00:00 |
|
James Lemieux
|
05629b2975
|
am e811c774: am 40236a89: Display sync errors using snackbar and not as a TL footer
* commit 'e811c77465ebbff11035754139e85444713e2d17':
Display sync errors using snackbar and not as a TL footer
|
2014-11-02 17:30:03 +00:00 |
|
Baligh Uddin
|
5edde56b81
|
am 28a37183: (-s ours) am abd75d1a: (-s ours) Import translations. DO NOT MERGE
* commit '28a37183f0cf3b4716cffd4c39bbf397d5db661c':
Import translations. DO NOT MERGE
|
2014-11-02 17:30:02 +00:00 |
|
Régis Décamps
|
32bb6854fa
|
am 1b2a0df1: am f99328b0: minor: remove comment that primaryColor is used for ActionBar
* commit '1b2a0df1209227e519ca169d001f1a2989e1a713':
minor: remove comment that primaryColor is used for ActionBar
|
2014-11-02 17:30:01 +00:00 |
|
Martin Hibdon
|
3381416c55
|
am cacf4c53: am 3c2f782c: When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
* commit 'cacf4c53de0d619b67ae8c1545c76e8aac10018c':
When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
|
2014-11-02 17:29:59 +00:00 |
|
Martin Hibdon
|
a9a341d959
|
am e9a49c17: am d10ae46e: Merge "Don\'t allow disabling of the camera with managed profiles" into ub-gmail-ur14-dev
* commit 'e9a49c1793e66d6b0eb6484814e6f6d8dcc16dfd':
Don't allow disabling of the camera with managed profiles
|
2014-11-02 17:29:58 +00:00 |
|
Rohan Shah
|
636fed7d0b
|
am 33cf634a: am a64435a6: Update colors in Email (ColorRefactor)
* commit '33cf634a6e82e2d1425a5eea927e8ccadaff8ca9':
Update colors in Email (ColorRefactor)
|
2014-11-02 17:29:57 +00:00 |
|
Martin Hibdon
|
3c38f6ac95
|
am ef0dc0ac: am 809313bd: Merge "Add ability to clear migration state to debug screen" into ub-gmail-ur14-dev
* commit 'ef0dc0ac016776c704ccd5ea9805b610664bc46f':
Add ability to clear migration state to debug screen
|
2014-11-02 17:29:55 +00:00 |
|
Martin Hibdon
|
1ae6e4d9da
|
am 4e794038: am 123d4028: Make sure to close a cursor
* commit '4e79403856af4fcfeb926856edb58a11cd9781c1':
Make sure to close a cursor
|
2014-11-02 17:29:54 +00:00 |
|
James Lemieux
|
399e0c3cf7
|
am 32152d96: am f1b6b3af: Old paper clip asset is removed, which touches a test case here.
* commit '32152d96e5ba4233acfa17644738428c9a9e0c82':
Old paper clip asset is removed, which touches a test case here.
|
2014-11-02 17:29:53 +00:00 |
|
Baligh Uddin
|
21f273ea8b
|
am bdfea7ff: (-s ours) am d54cebe5: (-s ours) Import translations. DO NOT MERGE
* commit 'bdfea7ffd06f511d969d3b6a4bacc479dd9f683c':
Import translations. DO NOT MERGE
|
2014-11-02 17:29:51 +00:00 |
|
Andrew Sapperstein
|
a29c688439
|
am 8fd1a38c: am 9f252e1f: Renaming to support drawer under status bar.
* commit '8fd1a38c6af1f3622dd55aa709ff61a9478c0f17':
Renaming to support drawer under status bar.
|
2014-11-02 17:29:50 +00:00 |
|
Baligh Uddin
|
570fce6068
|
am 928bbfef: (-s ours) am fc1ba99a: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit '928bbfeff210756348b38c7fd709e1dbd5699b05':
Import translations. DO NOT MERGE
|
2014-11-02 17:29:49 +00:00 |
|
Martin Hibdon
|
70f807fb64
|
am 5ae1599a: am 0b693a05: Merge "Fix subfolders of the inbox." into ub-gmail-ur14-dev
* commit '5ae1599a839e6dd2298f97740707b7f435acacd0':
Fix subfolders of the inbox.
|
2014-11-02 17:29:47 +00:00 |
|
Paul Westbrook
|
55e10293a8
|
am dcaf7988: am 7f32e9c6: Prevent AccountSettingsFragment from being stripped
* commit 'dcaf7988bd1e22adeac275ca7bea345185dd3868':
Prevent AccountSettingsFragment from being stripped
|
2014-11-02 17:29:46 +00:00 |
|
Paul Westbrook
|
954b358a26
|
am 26f193da: am bb68c13a: Changes to support smaller email tombstone apk size
* commit '26f193dab5a38a50d111c443b210838b5a62411b':
Changes to support smaller email tombstone apk size
|
2014-11-02 17:29:45 +00:00 |
|
Andrew Sapperstein
|
625bc3c04e
|
am 6bf29750: am 88929fd2: Switch to targetSdkVersion=21. b/16408109
* commit '6bf29750697bfd33bc1015631d8ba0ce6cf3f339':
Switch to targetSdkVersion=21. b/16408109
|
2014-11-02 17:29:44 +00:00 |
|
Baligh Uddin
|
45f0c596e8
|
am 503f4638: (-s ours) am 3b47856d: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit '503f46388d8522d22b4116c8b87a346b2ac18d15':
Import translations. DO NOT MERGE
|
2014-11-02 17:29:43 +00:00 |
|
Baligh Uddin
|
1b24aa0265
|
am 99cf59cb: (-s ours) am ff83aff9: (-s ours) am e421a5e1: (-s ours) Import translations. DO NOT MERGE
* commit '99cf59cbf492e7f6b14a3dbe0c43be63850a85f1':
Import translations. DO NOT MERGE
|
2014-11-02 17:29:42 +00:00 |
|
Martin Hibdon
|
416f921021
|
am 13666c7f: am 8209d6c0: Display a warning if account is on security hold
* commit '13666c7f92aa6e52e0200663af7c1db18cfb618f':
Display a warning if account is on security hold
|
2014-11-02 17:29:41 +00:00 |
|
Rohan Shah
|
505d411dfa
|
am 8645bd80: am 58d7f7b2: Merge "Tag Notifications with People (Email)" into ub-gmail-ur14-dev
* commit '8645bd80496f94c5a8b60fd54efeab577aab1e5c':
Tag Notifications with People (Email)
|
2014-11-02 17:29:40 +00:00 |
|
Tony Mantler
|
40feb8f94d
|
am 65d130ad: am b3be4655: Merge "Sync account immediately upon restore" into ub-gmail-ur14-dev
* commit '65d130ad2cab3022cc098e965a9891ec1a7f8e1f':
Sync account immediately upon restore
|
2014-11-02 17:29:39 +00:00 |
|
Tony Mantler
|
f44d334f4a
|
am ebfa64a7: am ce6e2de7: Merge "Use correct password dialog for outgoing settings" into ub-gmail-ur14-dev
* commit 'ebfa64a74233300dccce528f4fcb349defd3cd89':
Use correct password dialog for outgoing settings
|
2014-11-02 17:29:37 +00:00 |
|
Tony Mantler
|
d8800386f9
|
am 2d3730b5: am cb45d6fa: Merge "Change account type strings for AccountManager UI" into ub-gmail-ur14-dev
* commit '2d3730b5fdca6352b1cc1efcb31474a4e1dff8b5':
Change account type strings for AccountManager UI
|
2014-11-02 17:29:36 +00:00 |
|
Baligh Uddin
|
abc613bf46
|
am dc956891: (-s ours) am efca9af6: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit 'dc956891aab0729124df84792fe648e67be1fc50':
Import translations. DO NOT MERGE
|
2014-11-02 17:29:35 +00:00 |
|
Tony Mantler
|
86dda976c9
|
am a79eed71: am c6d5ec49: No more big yellow envelope
* commit 'a79eed714f106a5354730fe41b290bfb4a97d3b7':
No more big yellow envelope
|
2014-11-02 17:29:34 +00:00 |
|
Paul Westbrook
|
c2da775970
|
am 3262a8d8: am f866891f: Merge "Remove unused resources" into ub-gmail-ur14-dev
* commit '3262a8d807a66999f1b00d05b3e5d7c195ff031b':
Remove unused resources
|
2014-11-02 17:29:33 +00:00 |
|
Tony Mantler
|
3fb948e4ba
|
am 800d544a: am 8c6a01f8: Remove app icon from Setup and Mailbox Settings
* commit '800d544a81ae7fca7040a766344d680a6b767caf':
Remove app icon from Setup and Mailbox Settings
|
2014-11-02 17:29:32 +00:00 |
|
Tony Mantler
|
784b61cca1
|
am 34a686ab: am dfb7fe91: Remove password spaces warning
* commit '34a686ab019d4a748850f297687fc81278b69154':
Remove password spaces warning
|
2014-11-02 17:29:31 +00:00 |
|
Tony Mantler
|
cd77bc1b19
|
am 58310123: am 0ee42176: Merge "Fix spinners layout mangling" into ub-gmail-ur14-dev
* commit '58310123a7f227980c44dbe1c242bb5419383b74':
Fix spinners layout mangling
|
2014-11-02 17:29:30 +00:00 |
|
Paul Westbrook
|
091ed0db8b
|
am b4986725: am 6a07fc19: Merge "Remove unused resource" into ub-gmail-ur14-dev
* commit 'b49867251facbd3ad04beb89a8b6e4e2bb60d497':
Remove unused resource
|
2014-11-02 17:29:29 +00:00 |
|
Martin Hibdon
|
2562a4df31
|
am 61e79746: am c845295f: Merge "Fix the text of the authentication label on rotation" into ub-gmail-ur14-dev
* commit '61e79746f817c603d2aeb78006a78a787380b6eb':
Fix the text of the authentication label on rotation
|
2014-11-02 17:29:28 +00:00 |
|
Andrew Sapperstein
|
ec83f7fa3a
|
am 5b5d5585: am 86e17ba1: Merge "Set recents color for photoviewer. b/17389434" into ub-gmail-ur14-dev
* commit '5b5d55859e680030ef4a046b1424f9ff456b641f':
Set recents color for photoviewer. b/17389434
|
2014-11-02 17:29:27 +00:00 |
|
James Lemieux
|
46f73c05dd
|
am 7266502c: am 3bdce9b5: Remove server-side sanitized HTML capability; add client-side santized HTML capability
* commit '7266502c44032fea85ae4a79bb0e21706d0cbc82':
Remove server-side sanitized HTML capability; add client-side santized HTML capability
|
2014-11-02 17:29:26 +00:00 |
|
Tony Mantler
|
ac26021da7
|
am d50e207f: am 65669454: Set IME resize flag for AccountServerSettingsActivity
* commit 'd50e207f90e923a6e27c83d2c221fa3a24c0a9bb':
Set IME resize flag for AccountServerSettingsActivity
|
2014-11-02 17:29:25 +00:00 |
|
James Lemieux
|
325afc41ac
|
am 04c77181: am 1be8b05b: The error message "This field can\'t be blank" can be ignored
* commit '04c771810ae3484f6a2dc1698615e262f6cff0f0':
The error message "This field can't be blank" can be ignored
|
2014-11-02 17:29:24 +00:00 |
|
Baligh Uddin
|
dd454375a4
|
am 9ea9d245: (-s ours) am efb6cb25: (-s ours) Import translations. DO NOT MERGE
* commit '9ea9d245f99235da37b25c1b0c398b96e14d8a6c':
Import translations. DO NOT MERGE
|
2014-11-02 17:29:23 +00:00 |
|
Tony Mantler
|
39aa49109e
|
am 882e1a89: am e068440f: Merge "Update search folder status in a finally block" into ub-gmail-ur14-dev
* commit '882e1a89a7d6a3afb535181a921659cd6a9e303d':
Update search folder status in a finally block
|
2014-11-02 17:29:22 +00:00 |
|
Martin Hibdon
|
2569cfcb31
|
am 2ff1a5cd: am e87b38fa: Merge "Prevent account reconcilliation during migration" into ub-gmail-ur14-dev
* commit '2ff1a5cd8816657615776e93b1418d8da9e5cc64':
Prevent account reconcilliation during migration
|
2014-11-02 17:29:21 +00:00 |
|
Martin Hibdon
|
33ab7b3453
|
am 30d8d696: am 51c65364: Put debug screen back into settings
* commit '30d8d696eaf5654ccc3ddb3e2714ebcd972451a9':
Put debug screen back into settings
|
2014-11-02 17:29:20 +00:00 |
|
Baligh Uddin
|
eb3588bc31
|
am 94d76eb9: (-s ours) Import translations. DO NOT MERGE automerge: 1c0aa4c -s ours
* commit '94d76eb9c9376fc061a839a3f7653d3a309b6b75':
Import translations. DO NOT MERGE
|
2014-11-02 17:28:58 +00:00 |
|
Jin Cao
|
0b27b809cc
|
am 8d6c6348: Should use stateAlwaysHidden for inputmode automerge: aa705e6
* commit '8d6c6348dc91d8a8db28ff064b6bf3b54df285f9':
Should use stateAlwaysHidden for inputmode
|
2014-11-02 17:28:56 +00:00 |
|
Jin Cao
|
cdf595993e
|
am b7a5a10d: Merge "input mode to state hidden" into ub-gmail-ur14-dev automerge: e9186cd
* commit 'b7a5a10db9e2b3678323d14b92ec5d71f425e6dd':
input mode to state hidden
|
2014-11-02 17:28:55 +00:00 |
|
Anthony Lee
|
dc952e5d93
|
am 7ef66423: b/17209397. NOOP getServiceMap() if we are in the tombstone app. automerge: 0397e7f
* commit '7ef664233b990129f83bf817206b030cc362fc1e':
b/17209397. NOOP getServiceMap() if we are in the tombstone app.
|
2014-11-02 17:28:53 +00:00 |
|
Jin Cao
|
ac026ecb51
|
am 0d2f843d: Remove getSuggestionsAuthority automerge: 65c2179
* commit '0d2f843d897d688d94817476d1087f3d6170e59e':
Remove getSuggestionsAuthority
|
2014-11-02 17:28:25 +00:00 |
|
Jin Cao
|
a357f81eb9
|
am 1991e2a9: Merge "Remove default search for Email" into ub-gmail-ur14-dev automerge: 9ac6ec7
* commit '1991e2a93710f6f04e237f0d881365c3aa42d162':
Remove default search for Email
|
2014-11-02 17:28:23 +00:00 |
|
Tony Mantler
|
c48b966988
|
am 65bf9945: Fix search mailbox status on early-out when searching automerge: 207a35f
* commit '65bf9945341a0a39066e629472ed76864c6337d9':
Fix search mailbox status on early-out when searching
|
2014-11-02 17:28:22 +00:00 |
|
Tony Mantler
|
ea73ce4730
|
am c71afebb: Fix some AOSP NPEs automerge: 473ce1f
* commit 'c71afebb39b16f7384f096b9d50341f4f0bf25da':
Fix some AOSP NPEs
|
2014-11-02 17:28:20 +00:00 |
|
Anthony Lee
|
4f5e86fc80
|
am 982394da: Merge "b/17193866. Update policies when we reconcile." into ub-gmail-ur14-dev automerge: 355e9df
* commit '982394da32883a6c0518b8a627a73174183a1766':
b/17193866. Update policies when we reconcile.
|
2014-11-02 17:28:19 +00:00 |
|
Baligh Uddin
|
ee7eda0c6e
|
am 7e1932f7: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev automerge: 67995a4 -s ours
* commit '7e1932f72774f92d1646043f1c5bf75dd72c9c92':
Import translations. DO NOT MERGE
|
2014-11-02 17:28:18 +00:00 |
|