Commit Graph

14164 Commits

Author SHA1 Message Date
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
Anthony Lee
61a99bbb3b am 4f5e86fc: am 982394da: Merge "b/17193866. Update policies when we reconcile." into ub-gmail-ur14-dev automerge: 355e9df
* commit '4f5e86fc809f5a65cdac562b31499e54ad09a2a3':
  b/17193866. Update policies when we reconcile.
2014-11-02 17:36:48 +00:00
Baligh Uddin
e19bbf3815 am ee7eda0c: (-s ours) am 7e1932f7: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev automerge: 67995a4 -s ours
* commit 'ee7eda0c6efad5a0fb83949496ea771d6a8ef2b6':
  Import translations. DO NOT MERGE
2014-11-02 17:36:47 +00:00
Tony Mantler
65911dc2d2 am 831bb0ab: am b0432334: Match dup accounts against all accounts, not just Email automerge: c1a760b
* commit '831bb0abfea4974d7ab10876117a1524088a2a96':
  Match dup accounts against all accounts, not just Email
2014-11-02 17:36:46 +00:00
Anthony Lee
4ae25d3b45 am ca31da91: am 9d1dc789: b/17135753. Make sure to free ServiceConnection. automerge: 8c65e50
* commit 'ca31da91c8b844fc89595a055ccf08452f8273ee':
  b/17135753. Make sure to free ServiceConnection.
2014-11-02 17:36:44 +00:00
Andrew Sapperstein
ad1137d1e6 am ecb6fc31: am 69dda480: Merge "Use appcompat photoviewer." into ub-gmail-ur14-dev automerge: b042013
* commit 'ecb6fc314fb15a334ea9362e73a8cb701eca6cf0':
  Use appcompat photoviewer.
2014-11-02 17:36:43 +00:00
Tony Mantler
49c8521dbb am 214cf5cf: am e34c3677: Merge "Drawer resource updates" into ub-gmail-ur14-dev automerge: 1e6f26a
* commit '214cf5cf93513a1f5ef26851774aa9bc038f1ccb':
  Drawer resource updates
  Update Notifications (Email)
2014-11-02 17:36:42 +00:00
Geoff Mendal
268485ff92 am b188964b: (-s ours) am 96ade4e2: (-s ours) Import translations. DO NOT MERGE
* commit 'b188964b16ef63bfeb8e6fbaca98913958f88f10':
  Import translations. DO NOT MERGE
2014-11-02 17:30:44 +00:00
Tony Mantler
f495b95d7a am 67b60f66: am b57bca27: Default to encrypted connections (YAY!)
* commit '67b60f66a8293086764e1b32c6c3261c56ac0d26':
  Default to encrypted connections (YAY!)
2014-11-02 17:30:43 +00:00
Martin Hibdon
ab743fb543 am 0f6acb54: am f0bbcd85: Add additional analytics regarding our SSLSockets
* commit '0f6acb548b61eabff2a78366c05a8e8c10e25850':
  Add additional analytics regarding our SSLSockets
2014-11-02 17:30:42 +00:00
Martin Hibdon
979511590c am 0e1bdee9: am 21dc44d2: Merge "Add analytics to track of what cipher suites are being used" into ub-gmail-ur14-dev
* commit '0e1bdee9ac1cbbaf296e7948c24921f15093278d':
  Add analytics to track of what cipher suites are being used
2014-11-02 17:30:41 +00:00
Martin Hibdon
dc6f3aafa8 am 85d0fdbe: am 303b553b: Allow an external security provider to be installed
* commit '85d0fdbe8f1618d331258009b423ad7686c7790b':
  Allow an external security provider to be installed
2014-11-02 17:30:40 +00:00
Martin Hibdon
a67e221267 am be216a96: am a908d45a: Merge "Add deprecated cipher suites to our SSLSocket" into ub-gmail-ur14-dev
* commit 'be216a96db3df50d9341dd3330313a872b6b44f1':
  Add deprecated cipher suites to our SSLSocket
2014-11-02 17:30:39 +00:00
Anthony Lee
4827f0bc40 am f85d9e08: am 9d73facf: Merge "Fix restoreBodySource key so it returns the correct value." into ub-gmail-ur14-dev
* commit 'f85d9e08352ab12becf9aac0c0945a7edc036850':
  Fix restoreBodySource key so it returns the correct value.
2014-11-02 17:30:38 +00:00
Martin Hibdon
c0e8417e68 am d77bf0c6: am 764d7b2f: Merge "Disable smart foward/reply" into ub-gmail-ur14-dev
* commit 'd77bf0c6e1ea965f251c7408b77aed868ea80ca7':
  Disable smart foward/reply
2014-11-02 17:30:37 +00:00
Geoff Mendal
968156982e am 34418383: (-s ours) am 98f764fb: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit '34418383c50a4979961753086df6e82c9245b5ef':
  Import translations. DO NOT MERGE
2014-11-02 17:30:36 +00:00
Tony Mantler
0f3a01a411 am 14286249: am d716d894: Don\'t assume mHostAuthRecv is loaded when checking outgoing
* commit '142862491526da44250abd5913fa1071772de6da':
  Don't assume mHostAuthRecv is loaded when checking outgoing
2014-11-02 17:30:34 +00:00
Tony Mantler
d82ae435ec am 461d3e74: am 1182e1f9: Merge "Fix handling AOL\'s login rejection" into ub-gmail-ur14-dev
* commit '461d3e749a32a946bfef1ea567dac04fcbaa12b7':
  Fix handling AOL's login rejection
2014-11-02 17:30:33 +00:00
Baligh Uddin
8e9d01c9c3 am 2782b49d: (-s ours) am c2061fb3: (-s ours) Import translations. DO NOT MERGE
* commit '2782b49d5fe797c0df6e94fb8d1f9a4efe386130':
  Import translations. DO NOT MERGE
2014-11-02 17:30:32 +00:00
Régis Décamps
53e49db33a am 955b9f96: am d7192f02: Provider configuration for outlook, yahoo, gmx
* commit '955b9f96107559402a266fa81b98b6e8c90d32ea':
  Provider configuration for outlook, yahoo, gmx
2014-11-02 17:30:31 +00:00
Martin Hibdon
9332c48f56 am 349e6b91: am f61e098a: Correctly update UI_SYNC_STATUS upon search
* commit '349e6b910514f5194702aeac39a448bd155fc929':
  Correctly update UI_SYNC_STATUS upon search
2014-11-02 17:30:30 +00:00
Geoff Mendal
683ceefaa5 am feb9d48a: (-s ours) am 58685874: (-s ours) Import translations. DO NOT MERGE
* commit 'feb9d48a790fcac0ca674ae9a5f6be03ff50df2d':
  Import translations. DO NOT MERGE
2014-11-02 17:30:28 +00:00
Régis Décamps
fad809111c am 4ed38cc1: am 2128e365: Merge "Resend notifications when Accounts are changed" into ub-gmail-ur14-dev
* commit '4ed38cc14c55c36de8d0ca43423d96d521e51465':
  Resend notifications when Accounts are changed
2014-11-02 17:30:27 +00:00
Martin Hibdon
1a10b8f790 am e4a62a76: am 7b44fda9: Merge "Set mailbox uiSyncStatus when IMAP and POP folders are created" into ub-gmail-ur14-dev
* commit 'e4a62a769654d22f31a92167921a2679637ff044':
  Set mailbox uiSyncStatus when IMAP and POP folders are created
2014-11-02 17:30:26 +00:00
Tony Mantler
14c08377e6 am 06e38818: am f9757504: Merge "Reload settings immediately after toggling sync" into ub-gmail-ur14-dev
* commit '06e38818a7a117c5f500d3906b867b353625e398':
  Reload settings immediately after toggling sync
2014-11-02 17:30:25 +00:00
Tony Mantler
6a9a2f43e9 am 433f689c: am 1d929d18: Initial account setup analytics
* commit '433f689cc489d4973b29a058449ad58d48278540':
  Initial account setup analytics
2014-11-02 17:30:24 +00:00
Geoff Mendal
fba6f6f3a1 am 863984a7: (-s ours) am 4012d748: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit '863984a7be34df1cbadb7548e84272c0876411c5':
  Import translations. DO NOT MERGE
2014-11-02 17:30:23 +00:00
Rohan Shah
0fd0268871 am d1599a86: am 72f6a243: Revert "Update notification icon asset names (Email)"
* commit 'd1599a86d5e0f1d3ef3e2299466a0dc37949702b':
  Revert "Update notification icon asset names (Email)"
2014-11-02 17:30:22 +00:00
Rohan Shah
56caa6e1c1 am bcbe5794: am cc82965a: Update notification icon asset names (Email)
* commit 'bcbe5794fe4746931ec23be266b4dac31756fd82':
  Update notification icon asset names (Email)
2014-11-02 17:30:20 +00:00
Martin Hibdon
d51891fb4c am 901255ce: am 5fde01e4: Merge "Set the search mailbox\'s syncState as soon as a search is requested" into ub-gmail-ur14-dev
* commit '901255ce4e681cd906945e8a7477fe138de4eb15':
  Set the search mailbox's syncState as soon as a search is requested
2014-11-02 17:30:19 +00:00
Martin Hibdon
f9292376a2 am 8a99e742: am 89272781: EmailProvider now supports query and getType for cached file urls
* commit '8a99e742f5445ea4917515289f4c54f8474dc818':
  EmailProvider now supports query and getType for cached file urls
2014-11-02 17:30:18 +00:00
Tony Mantler
9d3b1a8d0e am 06cc928f: am 1927361b: Merge "Account authentication restyling" into ub-gmail-ur14-dev
* commit '06cc928fd3f1e535153027c9d519a064c7844388':
  Account authentication restyling
2014-11-02 17:30:17 +00:00
Régis Décamps
d606e82521 am f62b6843: am 8c0253a1: Merge "Replace "Corporate" by "Exchange"." into ub-gmail-ur14-dev
* commit 'f62b684315cdfa06809629ed430206c9eaa3ba0a':
  Replace "Corporate" by "Exchange".
2014-11-02 17:30:16 +00:00
Tony Mantler
815252ad3d am 31966801: am 746dcf06: Merge "Restyle account setup flow nav buttons" into ub-gmail-ur14-dev
* commit '3196680159dc9752f7b601504dcf0a3b34be23e1':
  Restyle account setup flow nav buttons
2014-11-02 17:30:15 +00:00
Geoff Mendal
f3a519c22b am d7063821: (-s ours) am 2a1daaae: (-s ours) Import translations. DO NOT MERGE
* commit 'd7063821e32bb9fdc9c612c25e439c129a58e6ed':
  Import translations. DO NOT MERGE
2014-11-02 17:30:14 +00:00
Baligh Uddin
8182d3a77d am a3bfe727: (-s ours) am ab3ed2cb: (-s ours) Import translations. DO NOT MERGE
* commit 'a3bfe7271a80803945482ea71dea8a4317ab335b':
  Import translations. DO NOT MERGE
2014-11-02 17:30:13 +00:00
Martin Hibdon
c7d52321bc am 9ef12d1b: am 46f1b89f: Merge "Get SSLSocketFactory from GmsCore" into ub-gmail-ur14-dev
* commit '9ef12d1b01bf6e169c5865af8eb96ffedcfceab4':
  Get SSLSocketFactory from GmsCore
2014-11-02 17:30:12 +00:00
Anthony Lee
468a0417dd am c95714b3: am ec8c2ac9: Merge "Calculate available background threads for AttachmentService correctly." into ub-gmail-ur14-dev
* commit 'c95714b3d8203b055827710e5951f2b65e957da9':
  Calculate available background threads for AttachmentService correctly.
2014-11-02 17:30:10 +00:00
Rohan Shah
80f4af5a15 am cf3aad64: am 42a4f201: Move Email Icons (Email)
* commit 'cf3aad6411d5ca867756c7b504999a740f1ace62':
  Move Email Icons (Email)
2014-11-02 17:30:09 +00:00