Merge commit '419a36ca6e8d0c46875e82c1e8be245b45adbb52' into gingerbread-plus-aosp
* commit '419a36ca6e8d0c46875e82c1e8be245b45adbb52':
Give email its own version# scheme. DO NOT MERGE
Merge commit 'ba95e58afd450b747eba87c614db98cc221ed804' into gingerbread-plus-aosp
* commit 'ba95e58afd450b747eba87c614db98cc221ed804':
New downscaled menu assets
Merge commit 'd7876681a85a4cc799feec775bdfe7927f983464' into gingerbread-plus-aosp
* commit 'd7876681a85a4cc799feec775bdfe7927f983464':
Reorganize startup/shutdown code in SyncManager DO NOT MERGE
Merge commit 'aa32ce7ea59db1e61908225a558d0dcc9a395ae4' into gingerbread-plus-aosp
* commit 'aa32ce7ea59db1e61908225a558d0dcc9a395ae4':
Import revised translations. DO NOT MERGE
Merge commit '5849608f5e804efca081c80b19534583cac689bc' into gingerbread-plus-aosp
* commit '5849608f5e804efca081c80b19534583cac689bc':
Genericize strings that refer to the SD card.
Merge commit 'a9bc41f5ecea991d06b88ce861a412288303e9dd' into gingerbread-plus-aosp
* commit 'a9bc41f5ecea991d06b88ce861a412288303e9dd':
Show server name instead of account name
The format string "The server %s requires that you allow it to remotely
control some security features of your phone." was being displayed with
the account name instead of the server name.
Bug: 3011124
Change-Id: I1aadb5790297777831dd69f04ea89641240b7b87
Merge commit 'e242578a49f54a9f46d0bd68de53c98d7dc460fb' into gingerbread-plus-aosp
* commit 'e242578a49f54a9f46d0bd68de53c98d7dc460fb':
Make WebViews clickable DO NOT MERGE
Merge commit 'ac916da48e2a550815ac13445038528aa4011442' into gingerbread-plus-aosp
* commit 'ac916da48e2a550815ac13445038528aa4011442':
Improve handling of content-disposition DO NOT MERGE
* Makes the side-scrollable again
* Required after making them non-long-clickable
Requires companion change in WebView, to allow touch events while
clickable or long clickable (it had been requiring both)
Bug: 3036477
Change-Id: I4cae46d047f825d2aab08d254287855b187e9207
* Check array returned by split("=")
* Add unit tests for this case
* Also add unit tests for quoting removal
Bug: 3040796
Backport from: I170f3cd483fe35186194edeb0c3142fb0e2e9b75
Change-Id: I32ccbdbc7264a95a9cd279218cae390e65e82eeb
Merge commit '658df8f69ffe0885dcf99136ec8bd77cacdec505' into gingerbread-plus-aosp
* commit '658df8f69ffe0885dcf99136ec8bd77cacdec505':
Allow spaces in passwords DO NOT MERGE
Merge commit 'f617a25a7b55194ded8f2980a98c1a6482ba0513' into gingerbread-plus-aosp
* commit 'f617a25a7b55194ded8f2980a98c1a6482ba0513':
Trim unwanted whitespace from translations. DO NOT MERGE
Merge commit '0dd360c207f059ed660abdcee6218e8453b81289' into gingerbread-plus-aosp
* commit '0dd360c207f059ed660abdcee6218e8453b81289':
Increase EmailServiceProxy timeout for validation attempts
Block oversize attachments from being sent
Merge commit '7542efcfb8871f032573b24be603bc6f6b27eb62' into gingerbread-plus-aosp
* commit '7542efcfb8871f032573b24be603bc6f6b27eb62':
Import revised translations. DO NOT MERGE
Merge commit 'deed4505e9ad11626a8163653def57318b2d7d39' into gingerbread-plus-aosp
* commit 'deed4505e9ad11626a8163653def57318b2d7d39':
Increase EAS command timeout from 20 to 30 seconds
Merge commit 'ed824a07ae8389f1d9fb2214ad91356109b35a05' into gingerbread-plus-aosp
* commit 'ed824a07ae8389f1d9fb2214ad91356109b35a05':
DO NOT MERGE Harden thumbnail creation
Merge commit 'ebba88e4f4b3dd8001c6e1d2e4c1944aef613795' into gingerbread-plus-aosp
* commit 'ebba88e4f4b3dd8001c6e1d2e4c1944aef613795':
DO NOT MERGE disallow longpress in WebView
Merge commit 'd46952e7b0d47a4150d140502caf34e3a5276dd8' into gingerbread-plus-aosp
* commit 'd46952e7b0d47a4150d140502caf34e3a5276dd8':
DO NOT MERGE: Test validity of port numbers in account setup
Merge commit 'ccfc1c29c2f9fff7ee824d342bde1e5d7138722b' into gingerbread-plus-aosp
* commit 'ccfc1c29c2f9fff7ee824d342bde1e5d7138722b':
DO NOT MERGE: Don't disable account box if sync freq -> "Never"
Merge commit '6f207f5df2a1b4190e5da243fd497dcf168899af' into gingerbread-plus-aosp
* commit '6f207f5df2a1b4190e5da243fd497dcf168899af':
DO NOT MERGE: Interpret "busy" on new events to mean "no response"
* The meaning of a busy status of "Busy" is uncertain; it could mean
"Accepted" or "Tentative", depending on whether the event was
created via OWA/Outlook or EAS
* We have interpreted it as "Accepted", which prevents the user from
actually accepting the event (as a state change is required for us
to send updates to the server/organizer)
* This CL changes the behavior such that a newly arriving event with
a "Busy" status is shown as "No response" in the Calendar, thereby
allowing the user to pick from any of the three possible options.
Bug: 2811859
Change-Id: I321f714e54e66ee8f40f5e2c00587b98bad71a63
