Commit Graph

14302 Commits

Author SHA1 Message Date
Rohan Shah d2ad093397 am 67df0850: am 8a305452: am 6a533823: Merge "Clean-up Email Icons" into ub-gmail-ur14-dev
* commit '67df0850e412c6278264e989af63e8964bfdca86':
  Clean-up Email Icons
2014-11-02 17:37:46 +00:00
Tony Mantler 941d0a4661 am 2ba65aec: am fa93a71b: am b62067e3: Make sure old body files don\'t contaminate new messages
* commit '2ba65aec8c978447e3b5e03be715d99430ebf009':
  Make sure old body files don't contaminate new messages
2014-11-02 17:37:45 +00:00
James Lemieux 417c1deda2 am c909ad16: am 826e61c0: am 69ba565b: Merge "Combined view should also display client-side sanitized HTML" into ub-gmail-ur14-dev
* commit 'c909ad1654b544f83a6fc8271c210a016773e0d8':
  Combined view should also display client-side sanitized HTML
2014-11-02 17:37:44 +00:00
James Lemieux ab841bb554 am 05629b29: am e811c774: am 40236a89: Display sync errors using snackbar and not as a TL footer
* commit '05629b29751ffa6a0c0b725547628b2146f46dd6':
  Display sync errors using snackbar and not as a TL footer
2014-11-02 17:37:43 +00:00
Baligh Uddin a8fee47f76 am 5edde56b: (-s ours) am 28a37183: (-s ours) am abd75d1a: (-s ours) Import translations. DO NOT MERGE
* commit '5edde56b813d8c2e27accaf0c418d5f6203593db':
  Import translations. DO NOT MERGE
2014-11-02 17:37:42 +00:00
Régis Décamps c097bb3d20 am 32bb6854: am 1b2a0df1: am f99328b0: minor: remove comment that primaryColor is used for ActionBar
* commit '32bb6854fa27f42d3dc8e0815b1b43aeed4930b5':
  minor: remove comment that primaryColor is used for ActionBar
2014-11-02 17:37:41 +00:00
Martin Hibdon 7ac3a29506 am 3381416c: am cacf4c53: am 3c2f782c: When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
* commit '3381416c557cf0b1bff10332cdc90f438d77936b':
  When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
2014-11-02 17:37:40 +00:00
Martin Hibdon 4e91ba99ea am a9a341d9: am e9a49c17: am d10ae46e: Merge "Don\'t allow disabling of the camera with managed profiles" into ub-gmail-ur14-dev
* commit 'a9a341d959d424671b22941f0d3d9bc6bd0b392b':
  Don't allow disabling of the camera with managed profiles
2014-11-02 17:37:39 +00:00
Rohan Shah 678ca4bad5 am 636fed7d: am 33cf634a: am a64435a6: Update colors in Email (ColorRefactor)
* commit '636fed7d0b551d284521bdec097d2339c493e741':
  Update colors in Email (ColorRefactor)
2014-11-02 17:37:38 +00:00
Martin Hibdon 276f275c54 am 3c38f6ac: am ef0dc0ac: am 809313bd: Merge "Add ability to clear migration state to debug screen" into ub-gmail-ur14-dev
* commit '3c38f6ac9508786542fb22fb87b51d0121925c8c':
  Add ability to clear migration state to debug screen
2014-11-02 17:37:37 +00:00
Martin Hibdon a1401e1c87 am 1ae6e4d9: am 4e794038: am 123d4028: Make sure to close a cursor
* commit '1ae6e4d9dab4e98e2903ca140651fe43fbbb3358':
  Make sure to close a cursor
2014-11-02 17:37:36 +00:00
James Lemieux 8a39dd5634 am 399e0c3c: am 32152d96: am f1b6b3af: Old paper clip asset is removed, which touches a test case here.
* commit '399e0c3cf701a5751549d060140c841d0bfbfb64':
  Old paper clip asset is removed, which touches a test case here.
2014-11-02 17:37:35 +00:00
Baligh Uddin e6556f74ba am 21f273ea: (-s ours) am bdfea7ff: (-s ours) am d54cebe5: (-s ours) Import translations. DO NOT MERGE
* commit '21f273ea8be828243c3ed34bb723b4f3de6bcf5d':
  Import translations. DO NOT MERGE
2014-11-02 17:37:34 +00:00
Andrew Sapperstein b3d3051039 am a29c6884: am 8fd1a38c: am 9f252e1f: Renaming to support drawer under status bar.
* commit 'a29c6884397b35bab88ce81eb062624532a7c467':
  Renaming to support drawer under status bar.
2014-11-02 17:37:33 +00:00
Baligh Uddin c95fa16f36 am 570fce60: (-s ours) am 928bbfef: (-s ours) am fc1ba99a: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit '570fce60686e95e96dccd52cd3c77c441f9d5999':
  Import translations. DO NOT MERGE
2014-11-02 17:37:31 +00:00
Martin Hibdon 67a1eec311 am 70f807fb: am 5ae1599a: am 0b693a05: Merge "Fix subfolders of the inbox." into ub-gmail-ur14-dev
* commit '70f807fb64287bc0e7ac055cdd252ca359ca8c84':
  Fix subfolders of the inbox.
2014-11-02 17:37:30 +00:00
Paul Westbrook 7bee86e74d am 55e10293: am dcaf7988: am 7f32e9c6: Prevent AccountSettingsFragment from being stripped
* commit '55e10293a85f762a80d9ed4b6c57717c43768ad3':
  Prevent AccountSettingsFragment from being stripped
2014-11-02 17:37:29 +00:00
Paul Westbrook 6a62de22e1 am 954b358a: am 26f193da: am bb68c13a: Changes to support smaller email tombstone apk size
* commit '954b358a26fbd917746161218482f2748a113723':
  Changes to support smaller email tombstone apk size
2014-11-02 17:37:28 +00:00
Andrew Sapperstein e2ab82c801 am 625bc3c0: am 6bf29750: am 88929fd2: Switch to targetSdkVersion=21. b/16408109
* commit '625bc3c04ebd2dca2b27e2a510b2d83853ce5c7b':
  Switch to targetSdkVersion=21. b/16408109
2014-11-02 17:37:27 +00:00
Baligh Uddin b96905a871 am 45f0c596: (-s ours) am 503f4638: (-s ours) am 3b47856d: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit '45f0c596e8cfcaf97b93a09798f6b2eb3a82d960':
  Import translations. DO NOT MERGE
2014-11-02 17:37:26 +00:00
Baligh Uddin 7bf320a784 am 1b24aa02: (-s ours) am 99cf59cb: (-s ours) am ff83aff9: (-s ours) am e421a5e1: (-s ours) Import translations. DO NOT MERGE
* commit '1b24aa0265cee43c73d96371c9a454cb39af2d51':
  Import translations. DO NOT MERGE
2014-11-02 17:37:25 +00:00
Martin Hibdon 472880614e am 416f9210: am 13666c7f: am 8209d6c0: Display a warning if account is on security hold
* commit '416f921021dcc06c86fd3c0c5d7bfd1800eafd94':
  Display a warning if account is on security hold
2014-11-02 17:37:24 +00:00
Rohan Shah f8ae0f7bfb am 505d411d: am 8645bd80: am 58d7f7b2: Merge "Tag Notifications with People (Email)" into ub-gmail-ur14-dev
* commit '505d411dfa84773c8c1f5e9dfc6214f955bf1bd9':
  Tag Notifications with People (Email)
2014-11-02 17:37:22 +00:00
Tony Mantler 93d419dd2d am 40feb8f9: am 65d130ad: am b3be4655: Merge "Sync account immediately upon restore" into ub-gmail-ur14-dev
* commit '40feb8f94d0a821d9a9cef0c14b19eb4db53dc68':
  Sync account immediately upon restore
2014-11-02 17:37:21 +00:00
Tony Mantler a78ba75e45 am f44d334f: am ebfa64a7: am ce6e2de7: Merge "Use correct password dialog for outgoing settings" into ub-gmail-ur14-dev
* commit 'f44d334f4a51768a7044dea3feeae7b1c2ca7780':
  Use correct password dialog for outgoing settings
2014-11-02 17:37:20 +00:00
Tony Mantler 2253810635 am d8800386: am 2d3730b5: am cb45d6fa: Merge "Change account type strings for AccountManager UI" into ub-gmail-ur14-dev
* commit 'd8800386f9e499830193cb38984db51d2128300b':
  Change account type strings for AccountManager UI
2014-11-02 17:37:19 +00:00
Baligh Uddin 85313f47b7 am abc613bf: (-s ours) am dc956891: (-s ours) am efca9af6: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit 'abc613bf46f8b73dda49bee50ac7563fe8530e2b':
  Import translations. DO NOT MERGE
2014-11-02 17:37:18 +00:00
Tony Mantler 99219eb0e3 am 86dda976: am a79eed71: am c6d5ec49: No more big yellow envelope
* commit '86dda976c948d0c443c6f782f3e076fc48c17280':
  No more big yellow envelope
2014-11-02 17:37:17 +00:00
Paul Westbrook 34370d5a6e am c2da7759: am 3262a8d8: am f866891f: Merge "Remove unused resources" into ub-gmail-ur14-dev
* commit 'c2da77597023544737dc34d5c1a31f80d625c333':
  Remove unused resources
2014-11-02 17:37:15 +00:00
Tony Mantler ee2a66b5b0 am 3fb948e4: am 800d544a: am 8c6a01f8: Remove app icon from Setup and Mailbox Settings
* commit '3fb948e4babca5556e97937ebb4eb803f213517d':
  Remove app icon from Setup and Mailbox Settings
2014-11-02 17:37:14 +00:00
Tony Mantler 685f2f1d64 am 784b61cc: am 34a686ab: am dfb7fe91: Remove password spaces warning
* commit '784b61cca1849d287bc8aa28702936edfcbd292b':
  Remove password spaces warning
2014-11-02 17:37:13 +00:00
Tony Mantler 47a2f0f73a am cd77bc1b: am 58310123: am 0ee42176: Merge "Fix spinners layout mangling" into ub-gmail-ur14-dev
* commit 'cd77bc1b1979abd99070229b135898005a26d1bb':
  Fix spinners layout mangling
2014-11-02 17:37:12 +00:00
Paul Westbrook 5401312847 am 091ed0db: am b4986725: am 6a07fc19: Merge "Remove unused resource" into ub-gmail-ur14-dev
* commit '091ed0db8ba8921d9d0df5338493fe03d3bbe3a1':
  Remove unused resource
2014-11-02 17:37:11 +00:00
Martin Hibdon 4113c904f8 am 2562a4df: am 61e79746: am c845295f: Merge "Fix the text of the authentication label on rotation" into ub-gmail-ur14-dev
* commit '2562a4df311befc2aaf10ba3621b0ff929764408':
  Fix the text of the authentication label on rotation
2014-11-02 17:37:10 +00:00
Andrew Sapperstein 0f493a8618 am ec83f7fa: am 5b5d5585: am 86e17ba1: Merge "Set recents color for photoviewer. b/17389434" into ub-gmail-ur14-dev
* commit 'ec83f7fa3a5c0805e0125a562ced5d75bb476dbe':
  Set recents color for photoviewer. b/17389434
2014-11-02 17:37:09 +00:00
James Lemieux 93d724aa2b am 46f73c05: am 7266502c: am 3bdce9b5: Remove server-side sanitized HTML capability; add client-side santized HTML capability
* commit '46f73c05dd864a04f93ee7866e3601f07270642b':
  Remove server-side sanitized HTML capability; add client-side santized HTML capability
2014-11-02 17:37:08 +00:00
Tony Mantler e62810f7f6 am ac26021d: am d50e207f: am 65669454: Set IME resize flag for AccountServerSettingsActivity
* commit 'ac26021da70b69cbb89b3994b19cf0e2acbd1191':
  Set IME resize flag for AccountServerSettingsActivity
2014-11-02 17:37:07 +00:00
James Lemieux 32a6138d5a am 325afc41: am 04c77181: am 1be8b05b: The error message "This field can\'t be blank" can be ignored
* commit '325afc41ac458e45c7949de9a9740423e48c8f5f':
  The error message "This field can't be blank" can be ignored
2014-11-02 17:37:06 +00:00
Baligh Uddin c7332f11fb am dd454375: (-s ours) am 9ea9d245: (-s ours) am efb6cb25: (-s ours) Import translations. DO NOT MERGE
* commit 'dd454375a4b5191b7d280b5a3c3ada56b01fa9c5':
  Import translations. DO NOT MERGE
2014-11-02 17:37:04 +00:00
Tony Mantler 91232a21f0 am 39aa4910: am 882e1a89: am e068440f: Merge "Update search folder status in a finally block" into ub-gmail-ur14-dev
* commit '39aa49109e6c66f95dd8f89257de84567bcf9f2d':
  Update search folder status in a finally block
2014-11-02 17:37:03 +00:00
Martin Hibdon 1db58a95be am 2569cfcb: am 2ff1a5cd: am e87b38fa: Merge "Prevent account reconcilliation during migration" into ub-gmail-ur14-dev
* commit '2569cfcb3159b2c4daba3cce5826ff769b297d63':
  Prevent account reconcilliation during migration
2014-11-02 17:37:02 +00:00
Martin Hibdon 341c8ef2ec am 33ab7b34: am 30d8d696: am 51c65364: Put debug screen back into settings
* commit '33ab7b34533244770fa664ef9478587668634cb2':
  Put debug screen back into settings
2014-11-02 17:37:01 +00:00
Baligh Uddin 0a7f63e01f am eb3588bc: (-s ours) am 94d76eb9: (-s ours) Import translations. DO NOT MERGE automerge: 1c0aa4c -s ours
* commit 'eb3588bc31f94ccc2011f6196174aa53e726cb03':
  Import translations. DO NOT MERGE
2014-11-02 17:37:00 +00:00
Jin Cao 5d03847c3f am 0b27b809: am 8d6c6348: Should use stateAlwaysHidden for inputmode automerge: aa705e6
* commit '0b27b809ccb8bdfcd64ad12e9190b798015ef138':
  Should use stateAlwaysHidden for inputmode
2014-11-02 17:36:59 +00:00
Jin Cao b0ad7f784b am cdf59599: am b7a5a10d: Merge "input mode to state hidden" into ub-gmail-ur14-dev automerge: e9186cd
* commit 'cdf595993e82b5029e6594955940240a3ad728b2':
  input mode to state hidden
2014-11-02 17:36:58 +00:00
Anthony Lee fb120f7c26 am dc952e5d: am 7ef66423: b/17209397. NOOP getServiceMap() if we are in the tombstone app. automerge: 0397e7f
* commit 'dc952e5d93c8186de382af1c1912c7bfe04d091d':
  b/17209397. NOOP getServiceMap() if we are in the tombstone app.
2014-11-02 17:36:56 +00:00
Jin Cao 5b366acf0c am ac026ecb: am 0d2f843d: Remove getSuggestionsAuthority automerge: 65c2179
* commit 'ac026ecb5119d5609aa463a286ac286dbd63c381':
  Remove getSuggestionsAuthority
2014-11-02 17:36:55 +00:00
Jin Cao d0a67be950 am a357f81e: am 1991e2a9: Merge "Remove default search for Email" into ub-gmail-ur14-dev automerge: 9ac6ec7
* commit 'a357f81eb91a54114252e84fa798c2a5c8eb90e8':
  Remove default search for Email
2014-11-02 17:36:53 +00:00
Tony Mantler 5a33a7899b am c48b9669: am 65bf9945: Fix search mailbox status on early-out when searching automerge: 207a35f
* commit 'c48b966988aec07805a13e3b90f45f350a479221':
  Fix search mailbox status on early-out when searching
2014-11-02 17:36:51 +00:00
Tony Mantler 89a36e1d44 am ea73ce47: am c71afebb: Fix some AOSP NPEs automerge: 473ce1f
* commit 'ea73ce4730be9a73a19291f7b2e246c0e145b1eb':
  Fix some AOSP NPEs
2014-11-02 17:36:50 +00:00