Commit Graph

14179 Commits

Author SHA1 Message Date
Martin Hibdon
e5f590518b am 2d488bf4: am 1db58a95: am 2569cfcb: am 2ff1a5cd: am e87b38fa: Merge "Prevent account reconcilliation during migration" into ub-gmail-ur14-dev
* commit '2d488bf43d30749269f5f01c35474ed6d7f98d05':
  Prevent account reconcilliation during migration
2014-11-02 17:50:32 +00:00
Martin Hibdon
6c8332b1ff am 059c6f36: am 341c8ef2: am 33ab7b34: am 30d8d696: am 51c65364: Put debug screen back into settings
* commit '059c6f36c46e36092c71efacd95615fe09abef90':
  Put debug screen back into settings
2014-11-02 17:50:31 +00:00
Baligh Uddin
fe03f4cc11 am 0d0d4d27: (-s ours) am 0a7f63e0: (-s ours) am eb3588bc: (-s ours) am 94d76eb9: (-s ours) Import translations. DO NOT MERGE automerge: 1c0aa4c -s ours
* commit '0d0d4d27116f5b1d2d56c484015b33d764cae06a':
  Import translations. DO NOT MERGE
2014-11-02 17:50:29 +00:00
Jin Cao
5869bbf7d7 am 81bfcfad: am 5d03847c: am 0b27b809: am 8d6c6348: Should use stateAlwaysHidden for inputmode automerge: aa705e6
* commit '81bfcfad16c2ceb29821a5810cd9c79d8c6b015b':
  Should use stateAlwaysHidden for inputmode
2014-11-02 17:50:28 +00:00
Jin Cao
1ff3372356 am b80fea64: am b0ad7f78: am cdf59599: am b7a5a10d: Merge "input mode to state hidden" into ub-gmail-ur14-dev automerge: e9186cd
* commit 'b80fea64d03423f735d93cc449503ea430418662':
  input mode to state hidden
2014-11-02 17:50:27 +00:00
Anthony Lee
58422f63aa am 351e982e: am fb120f7c: am dc952e5d: am 7ef66423: b/17209397. NOOP getServiceMap() if we are in the tombstone app. automerge: 0397e7f
* commit '351e982e23729827093580afb2151d8e3d89017a':
  b/17209397. NOOP getServiceMap() if we are in the tombstone app.
2014-11-02 17:50:26 +00:00
Jin Cao
5c2092481a am b9f42561: am 5b366acf: am ac026ecb: am 0d2f843d: Remove getSuggestionsAuthority automerge: 65c2179
* commit 'b9f425614de8dbcd958a84840dc93bb434cb5cd4':
  Remove getSuggestionsAuthority
2014-11-02 17:50:25 +00:00
Jin Cao
ab5dac4852 am 292cf390: am d0a67be9: am a357f81e: am 1991e2a9: Merge "Remove default search for Email" into ub-gmail-ur14-dev automerge: 9ac6ec7
* commit '292cf3904db5971272dd03cc83ec97814926ff6a':
  Remove default search for Email
2014-11-02 17:50:23 +00:00
Tony Mantler
eb7a2e7811 am 544b00f0: am 5a33a789: am c48b9669: am 65bf9945: Fix search mailbox status on early-out when searching automerge: 207a35f
* commit '544b00f00989b11b70b9c150d0d856964a28f390':
  Fix search mailbox status on early-out when searching
2014-11-02 17:50:22 +00:00
Tony Mantler
b1a155d7c0 am 066c3202: am 89a36e1d: am ea73ce47: am c71afebb: Fix some AOSP NPEs automerge: 473ce1f
* commit '066c3202dc4c96e069c8d50dfe61b2cb89c8e5d4':
  Fix some AOSP NPEs
2014-11-02 17:50:21 +00:00
Anthony Lee
07be492033 am 140784ce: am 61a99bbb: am 4f5e86fc: am 982394da: Merge "b/17193866. Update policies when we reconcile." into ub-gmail-ur14-dev automerge: 355e9df
* commit '140784ce881fb8e7d222053b7dcc69c48bca345f':
  b/17193866. Update policies when we reconcile.
2014-11-02 17:50:19 +00:00
Baligh Uddin
29159203b5 am ce660a6e: (-s ours) am e19bbf38: (-s ours) am ee7eda0c: (-s ours) am 7e1932f7: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev automerge: 67995a4 -s ours
* commit 'ce660a6ebb52d2f31e40d646969ad244c6575bc3':
  Import translations. DO NOT MERGE
2014-11-02 17:50:18 +00:00
Tony Mantler
9021503843 am ae99756f: am 65911dc2: am 831bb0ab: am b0432334: Match dup accounts against all accounts, not just Email automerge: c1a760b
* commit 'ae99756ff05580928b2ffb8511f49ee220631165':
  Match dup accounts against all accounts, not just Email
2014-11-02 17:50:17 +00:00
Anthony Lee
a677c1121b am 32c3580a: am 4ae25d3b: am ca31da91: am 9d1dc789: b/17135753. Make sure to free ServiceConnection. automerge: 8c65e50
* commit '32c3580aeef9de32750efae9cdf16284e0cfe890':
  b/17135753. Make sure to free ServiceConnection.
2014-11-02 17:50:15 +00:00
Andrew Sapperstein
5a841aff1d am e80fb6ce: am ad1137d1: am ecb6fc31: am 69dda480: Merge "Use appcompat photoviewer." into ub-gmail-ur14-dev automerge: b042013
* commit 'e80fb6cefe1dba9fb90288618b7b36b88cf557b0':
  Use appcompat photoviewer.
2014-11-02 17:50:14 +00:00
Tony Mantler
d59532d99b am 87ff47b6: am 49c8521d: am 214cf5cf: am e34c3677: Merge "Drawer resource updates" into ub-gmail-ur14-dev automerge: 1e6f26a
* commit '87ff47b6accd40cf747f80824a38c2d8e39f3da8':
  Drawer resource updates
  Update Notifications (Email)
2014-11-02 17:50:12 +00:00
Tony Mantler
8eca7d6a50 am ee2a66b5: am 3fb948e4: am 800d544a: am 8c6a01f8: Remove app icon from Setup and Mailbox Settings
* commit 'ee2a66b5b0632a2bbc09ebdfc555235eb56c1f27':
  Remove app icon from Setup and Mailbox Settings
2014-11-02 17:44:30 +00:00
Tony Mantler
e46c6c10c0 am 685f2f1d: am 784b61cc: am 34a686ab: am dfb7fe91: Remove password spaces warning
* commit '685f2f1d649c499622ef1c1ded523ab9b11574cc':
  Remove password spaces warning
2014-11-02 17:44:29 +00:00
Tony Mantler
31c4a2d045 am 47a2f0f7: am cd77bc1b: am 58310123: am 0ee42176: Merge "Fix spinners layout mangling" into ub-gmail-ur14-dev
* commit '47a2f0f73a5387de440cef1c42ff63d99189501d':
  Fix spinners layout mangling
2014-11-02 17:44:28 +00:00
Paul Westbrook
8969e378d9 am 54013128: am 091ed0db: am b4986725: am 6a07fc19: Merge "Remove unused resource" into ub-gmail-ur14-dev
* commit '54013128472cdcf313295ee2e20ccb59df076da1':
  Remove unused resource
2014-11-02 17:44:27 +00:00
Martin Hibdon
b0a1921985 am 4113c904: am 2562a4df: am 61e79746: am c845295f: Merge "Fix the text of the authentication label on rotation" into ub-gmail-ur14-dev
* commit '4113c904f847699c6c2006ff6604462494034c19':
  Fix the text of the authentication label on rotation
2014-11-02 17:44:26 +00:00
Andrew Sapperstein
52b81bfe5b am 0f493a86: am ec83f7fa: am 5b5d5585: am 86e17ba1: Merge "Set recents color for photoviewer. b/17389434" into ub-gmail-ur14-dev
* commit '0f493a8618668d859464b006e36a7f7642784e56':
  Set recents color for photoviewer. b/17389434
2014-11-02 17:44:25 +00:00
James Lemieux
a341c92d59 am 93d724aa: am 46f73c05: am 7266502c: am 3bdce9b5: Remove server-side sanitized HTML capability; add client-side santized HTML capability
* commit '93d724aa2b58a9035eac467f53fe9af56e0b3043':
  Remove server-side sanitized HTML capability; add client-side santized HTML capability
2014-11-02 17:44:23 +00:00
Tony Mantler
a59fce8eba am e62810f7: am ac26021d: am d50e207f: am 65669454: Set IME resize flag for AccountServerSettingsActivity
* commit 'e62810f7f6478efd1131ea2dba5ad3dc8e62a515':
  Set IME resize flag for AccountServerSettingsActivity
2014-11-02 17:44:22 +00:00
James Lemieux
386c33574c am 32a6138d: am 325afc41: am 04c77181: am 1be8b05b: The error message "This field can\'t be blank" can be ignored
* commit '32a6138d5afcc29b9a921928f5769f8a15e52d4c':
  The error message "This field can't be blank" can be ignored
2014-11-02 17:44:21 +00:00
Baligh Uddin
ec1fa677bd am c7332f11: (-s ours) am dd454375: (-s ours) am 9ea9d245: (-s ours) am efb6cb25: (-s ours) Import translations. DO NOT MERGE
* commit 'c7332f11fb214711623c82735234138f191ce540':
  Import translations. DO NOT MERGE
2014-11-02 17:44:20 +00:00
Tony Mantler
bcf42ff14b am 91232a21: am 39aa4910: am 882e1a89: am e068440f: Merge "Update search folder status in a finally block" into ub-gmail-ur14-dev
* commit '91232a21f0b0d68ec5da8970199c899b3da3ce31':
  Update search folder status in a finally block
2014-11-02 17:44:19 +00:00
Martin Hibdon
2d488bf43d am 1db58a95: am 2569cfcb: am 2ff1a5cd: am e87b38fa: Merge "Prevent account reconcilliation during migration" into ub-gmail-ur14-dev
* commit '1db58a95beb22f763e2d6fc9f39f936cf4855908':
  Prevent account reconcilliation during migration
2014-11-02 17:44:18 +00:00
Martin Hibdon
059c6f36c4 am 341c8ef2: am 33ab7b34: am 30d8d696: am 51c65364: Put debug screen back into settings
* commit '341c8ef2eca38c26f9837868b40dedcc47e6b470':
  Put debug screen back into settings
2014-11-02 17:44:17 +00:00
Baligh Uddin
0d0d4d2711 am 0a7f63e0: (-s ours) am eb3588bc: (-s ours) am 94d76eb9: (-s ours) Import translations. DO NOT MERGE automerge: 1c0aa4c -s ours
* commit '0a7f63e01f8dfed2765867854e4a4f23c2eb0a27':
  Import translations. DO NOT MERGE
2014-11-02 17:44:16 +00:00
Jin Cao
81bfcfad16 am 5d03847c: am 0b27b809: am 8d6c6348: Should use stateAlwaysHidden for inputmode automerge: aa705e6
* commit '5d03847c3ff543b8d74c98c9e2c76c225d22da4f':
  Should use stateAlwaysHidden for inputmode
2014-11-02 17:44:15 +00:00
Jin Cao
b80fea64d0 am b0ad7f78: am cdf59599: am b7a5a10d: Merge "input mode to state hidden" into ub-gmail-ur14-dev automerge: e9186cd
* commit 'b0ad7f784bb931fd876770c9004959322497da2c':
  input mode to state hidden
2014-11-02 17:44:14 +00:00
Anthony Lee
351e982e23 am fb120f7c: am dc952e5d: am 7ef66423: b/17209397. NOOP getServiceMap() if we are in the tombstone app. automerge: 0397e7f
* commit 'fb120f7c2663a58ec12daf06563b1d27add19e94':
  b/17209397. NOOP getServiceMap() if we are in the tombstone app.
2014-11-02 17:44:13 +00:00
Jin Cao
b9f425614d am 5b366acf: am ac026ecb: am 0d2f843d: Remove getSuggestionsAuthority automerge: 65c2179
* commit '5b366acf0c6b02fc22af494bf244a490c71e8005':
  Remove getSuggestionsAuthority
2014-11-02 17:44:11 +00:00
Jin Cao
292cf3904d am d0a67be9: am a357f81e: am 1991e2a9: Merge "Remove default search for Email" into ub-gmail-ur14-dev automerge: 9ac6ec7
* commit 'd0a67be95098394fbb3fe7a05b13c9e432caff3b':
  Remove default search for Email
2014-11-02 17:44:10 +00:00
Tony Mantler
544b00f009 am 5a33a789: am c48b9669: am 65bf9945: Fix search mailbox status on early-out when searching automerge: 207a35f
* commit '5a33a7899b9c152c4783ad4b8725d7c7736212f0':
  Fix search mailbox status on early-out when searching
2014-11-02 17:44:09 +00:00
Tony Mantler
066c3202dc am 89a36e1d: am ea73ce47: am c71afebb: Fix some AOSP NPEs automerge: 473ce1f
* commit '89a36e1d44249c40420a710336f7eb5fa376b722':
  Fix some AOSP NPEs
2014-11-02 17:44:08 +00:00
Anthony Lee
140784ce88 am 61a99bbb: am 4f5e86fc: am 982394da: Merge "b/17193866. Update policies when we reconcile." into ub-gmail-ur14-dev automerge: 355e9df
* commit '61a99bbb3bcd64253dc988ab99db9ff49d903d3f':
  b/17193866. Update policies when we reconcile.
2014-11-02 17:44:06 +00:00
Baligh Uddin
ce660a6ebb am e19bbf38: (-s ours) am ee7eda0c: (-s ours) am 7e1932f7: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev automerge: 67995a4 -s ours
* commit 'e19bbf3815b3f244f7ebee58ccc1371deca83d13':
  Import translations. DO NOT MERGE
2014-11-02 17:44:05 +00:00
Tony Mantler
ae99756ff0 am 65911dc2: am 831bb0ab: am b0432334: Match dup accounts against all accounts, not just Email automerge: c1a760b
* commit '65911dc2d2ecb08c7f40e203e8268dc91afc0388':
  Match dup accounts against all accounts, not just Email
2014-11-02 17:44:04 +00:00
Anthony Lee
32c3580aee am 4ae25d3b: am ca31da91: am 9d1dc789: b/17135753. Make sure to free ServiceConnection. automerge: 8c65e50
* commit '4ae25d3b4510f3c02709090fb0c6ddf64730ddad':
  b/17135753. Make sure to free ServiceConnection.
2014-11-02 17:44:01 +00:00
Andrew Sapperstein
e80fb6cefe am ad1137d1: am ecb6fc31: am 69dda480: Merge "Use appcompat photoviewer." into ub-gmail-ur14-dev automerge: b042013
* commit 'ad1137d1e68b923d310423c66b73c75bb19d6345':
  Use appcompat photoviewer.
2014-11-02 17:44:00 +00:00
Tony Mantler
87ff47b6ac am 49c8521d: am 214cf5cf: am e34c3677: Merge "Drawer resource updates" into ub-gmail-ur14-dev automerge: 1e6f26a
* commit '49c8521dbb1415318b5ebbe48e2c72d893c815b9':
  Drawer resource updates
  Update Notifications (Email)
2014-11-02 17:43:58 +00:00
Geoff Mendal
4301e602d5 am 268485ff: (-s ours) am b188964b: (-s ours) am 96ade4e2: (-s ours) Import translations. DO NOT MERGE
* commit '268485ff9268f3bfa6bcb925abf3b117425ed5c2':
  Import translations. DO NOT MERGE
2014-11-02 17:38:26 +00:00
Tony Mantler
aee74ef40d am f495b95d: am 67b60f66: am b57bca27: Default to encrypted connections (YAY!)
* commit 'f495b95d7a8ccff42c2fa1eaaa01be713644f2a7':
  Default to encrypted connections (YAY!)
2014-11-02 17:38:25 +00:00
Martin Hibdon
7c74d82bc6 am ab743fb5: am 0f6acb54: am f0bbcd85: Add additional analytics regarding our SSLSockets
* commit 'ab743fb543424c2e18558881f7264b1a66b6ce2c':
  Add additional analytics regarding our SSLSockets
2014-11-02 17:38:24 +00:00
Martin Hibdon
30d6f0460c am 97951159: am 0e1bdee9: am 21dc44d2: Merge "Add analytics to track of what cipher suites are being used" into ub-gmail-ur14-dev
* commit '979511590cafb226edefa6e5219e42d7a1b2cad6':
  Add analytics to track of what cipher suites are being used
2014-11-02 17:38:23 +00:00
Martin Hibdon
94190da369 am dc6f3aaf: am 85d0fdbe: am 303b553b: Allow an external security provider to be installed
* commit 'dc6f3aafa80c9efbf69f9fdf5b432bcac4832254':
  Allow an external security provider to be installed
2014-11-02 17:38:22 +00:00
Martin Hibdon
04b776268b am a67e2212: am be216a96: am a908d45a: Merge "Add deprecated cipher suites to our SSLSocket" into ub-gmail-ur14-dev
* commit 'a67e2212677e5f39085fcdbf1c239075010e4e16':
  Add deprecated cipher suites to our SSLSocket
2014-11-02 17:38:21 +00:00
Anthony Lee
cadbc47f79 am 4827f0bc: am f85d9e08: am 9d73facf: Merge "Fix restoreBodySource key so it returns the correct value." into ub-gmail-ur14-dev
* commit '4827f0bc4085d44d7524145b22856d78316ebfec':
  Fix restoreBodySource key so it returns the correct value.
2014-11-02 17:38:19 +00:00