Martin Hibdon
2ff1a5cd88
am e87b38fa: Merge "Prevent account reconcilliation during migration" into ub-gmail-ur14-dev
...
* commit 'e87b38faf5e50e1d23055ce756570373e9344db2':
Prevent account reconcilliation during migration
2014-11-02 15:32:06 +00:00
Martin Hibdon
30d8d696ea
am 51c65364: Put debug screen back into settings
...
* commit '51c653646d14d841fbe527aee9fab7a1886338f8':
Put debug screen back into settings
2014-11-02 15:32:05 +00:00
Baligh Uddin
94d76eb9c9
Import translations. DO NOT MERGE
...
automerge: 1c0aa4c
2014-11-02 07:13:50 +00:00
Jin Cao
8d6c6348dc
Should use stateAlwaysHidden for inputmode
...
automerge: aa705e6
2014-11-02 07:13:29 +00:00
Jin Cao
b7a5a10db9
Merge "input mode to state hidden" into ub-gmail-ur14-dev
...
automerge: e9186cd
2014-11-02 07:13:07 +00:00
Anthony Lee
7ef664233b
b/17209397. NOOP getServiceMap() if we are in the tombstone app.
...
automerge: 0397e7f
2014-11-02 07:12:31 +00:00
Jin Cao
0d2f843d89
Remove getSuggestionsAuthority
...
automerge: 65c2179
2014-11-02 07:09:42 +00:00
Jin Cao
1991e2a937
Merge "Remove default search for Email" into ub-gmail-ur14-dev
...
automerge: 9ac6ec7
2014-11-02 07:09:35 +00:00
Tony Mantler
65bf994534
Fix search mailbox status on early-out when searching
...
automerge: 207a35f
2014-11-02 07:09:28 +00:00
Tony Mantler
c71afebb39
Fix some AOSP NPEs
...
automerge: 473ce1f
2014-11-02 07:09:21 +00:00
Anthony Lee
982394da32
Merge "b/17193866. Update policies when we reconcile." into ub-gmail-ur14-dev
...
automerge: 355e9df
2014-11-02 07:09:06 +00:00
Baligh Uddin
7e1932f727
Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
...
automerge: 67995a4
2014-11-02 07:08:52 +00:00
Tony Mantler
b043233486
Match dup accounts against all accounts, not just Email
...
automerge: c1a760b
2014-11-02 07:07:43 +00:00
Anthony Lee
9d1dc78916
b/17135753. Make sure to free ServiceConnection.
...
automerge: 8c65e50
2014-11-02 07:06:41 +00:00
Andrew Sapperstein
69dda4803a
Merge "Use appcompat photoviewer." into ub-gmail-ur14-dev
...
automerge: b042013
2014-11-02 07:06:06 +00:00
Tony Mantler
e34c3677b4
Merge "Drawer resource updates" into ub-gmail-ur14-dev
...
automerge: 1e6f26a
2014-11-02 07:04:54 +00:00
Martin Hibdon
764d7b2f66
Merge "Disable smart foward/reply" into ub-gmail-ur14-dev
2014-10-21 20:08:50 +00:00
Martin Hibdon
99665fe7bf
Disable smart foward/reply
...
b/17720266
When replying to a message, sometimes the wrong message
is included in the reply. This seems to be related to
smart reply/forward, since it only has ever been known to
happen on an Exchange 2013 server. For now, disable smart
reply/forward.
We do this by making the EmailProvider always zero out the
FLAGS_SUPPORTS_SMART_FORWARD bit on the account. This way
we can control this feature from the Email app, rather than
Exchange.
Change-Id: I88bb5f06a1098f9f085592b0a3cf1a01d9eb3fc7
2014-10-21 13:07:36 -07:00
Geoff Mendal
98f764fb72
Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
2014-10-20 18:39:45 +00:00
Geoff Mendal
8b9f84665d
Import translations. DO NOT MERGE
...
Change-Id: I4b9d449c4004d7a12c0b2abd48ed12999cacbf5b
Auto-generated-cl: translation import
2014-10-20 11:24:58 -07:00
Tony Mantler
d716d89459
Don't assume mHostAuthRecv is loaded when checking outgoing
...
b/18031180
Change-Id: I428021830db373145344a3477e1c5590e8062c10
2014-10-20 17:34:23 +00:00
Tony Mantler
1182e1f932
Merge "Fix handling AOL's login rejection" into ub-gmail-ur14-dev
2014-10-20 17:21:13 +00:00
Tony Mantler
a2f1da2bdc
Fix handling AOL's login rejection
...
Found while investigating b/18031180
b/18049329
Change-Id: I2c86449008fb5e89c84db1a0753b8a61f42305b9
2014-10-20 17:20:59 +00:00
Baligh Uddin
3b78a31059
am 7fd70814: (-s ours) am 4b6f2e7a: (-s ours) Import translations. DO NOT MERGE
...
* commit '7fd7081491e46d8c0d78ab9bc9822e801a1d450e':
Import translations. DO NOT MERGE
2014-10-20 00:34:46 +00:00
Baligh Uddin
7fd7081491
am 4b6f2e7a: (-s ours) Import translations. DO NOT MERGE
...
* commit '4b6f2e7a38c83c9bfa368c8aedef1cb5d91b7c8b':
Import translations. DO NOT MERGE
2014-10-20 00:29:56 +00:00
Baligh Uddin
c2061fb34a
Import translations. DO NOT MERGE
...
Change-Id: I4c4f519792f0c6e0fc21d0c768de5c979852280c
Auto-generated-cl: translation import
2014-10-19 16:24:48 -07:00
Baligh Uddin
4b6f2e7a38
Import translations. DO NOT MERGE
...
Change-Id: I7dccf29ecb1954edcaf288ff4467e6aee2d29c15
Auto-generated-cl: translation import
2014-10-19 16:11:30 -07:00
Régis Décamps
d7192f0213
Provider configuration for outlook, yahoo, gmx
...
Use the defautl configuration for Outlook, Yahoo and GMX
on all regional variants, rather than just `.com`.
Bug: 18027714 The default configuration for outlook.fr is not correct
Bug: 17156903 Update providers.xml with more up-to-date data
Change-Id: I88b5a3d5e467eb0fc40e398264478fe0a24c33ee
2014-10-17 14:23:44 +02:00
Martin Hibdon
f61e098a41
Correctly update UI_SYNC_STATUS upon search
...
b/17377040
Change-Id: I5cf9281fa204ac780b737215a86362a8317d63b6
2014-10-16 14:22:49 -07:00
Geoff Mendal
586858745f
Import translations. DO NOT MERGE
...
Change-Id: Ib25f13dd8347d95126da1b6a8c1f21c1470723a5
Auto-generated-cl: translation import
2014-10-15 07:14:56 -07:00
Régis Décamps
2128e36569
Merge "Resend notifications when Accounts are changed" into ub-gmail-ur14-dev
2014-10-15 12:38:35 +00:00
Martin Hibdon
7b44fda91e
Merge "Set mailbox uiSyncStatus when IMAP and POP folders are created" into ub-gmail-ur14-dev
2014-10-14 22:59:13 +00:00
Martin Hibdon
79cb83cad1
Set mailbox uiSyncStatus when IMAP and POP folders are created
...
b/17443087
Now for certain folder types, when they are first created,
the uiSyncStatus is set to NEEDS_INITIAL_SYNC. This prevents
us from displaying the empty state until after the sync has
completed.
Change-Id: Ib04c915f6972ecb75092dd50e90dee8647ee2f64
2014-10-14 15:52:58 -07:00
Tony Mantler
f9757504b6
Merge "Reload settings immediately after toggling sync" into ub-gmail-ur14-dev
2014-10-14 17:27:36 +00:00
Tony Mantler
1d929d18fe
Initial account setup analytics
...
Just activity start/stop.
b/17166224
Change-Id: If100a88d6b6fbe05165aaed90b1caaa9c3db12c3
2014-10-13 15:13:28 -07:00
Tony Mantler
0b9d3de5aa
Reload settings immediately after toggling sync
...
Twiddling the AccountManager bits doesn't automatically trigger a
content update, so we refresh manually in those cases.
b/17330140
Change-Id: I294173c9baca231a6f3ff045d0b7795c6b2b2219
2014-10-13 13:37:21 -07:00
Geoff Mendal
4012d74867
Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
2014-10-13 20:21:17 +00:00
Geoff Mendal
fc3b5cae3b
Import translations. DO NOT MERGE
...
Change-Id: I6b0cf46470c425b2c49207b0294c400476f84bef
Auto-generated-cl: translation import
2014-10-13 12:17:24 -07:00
Rohan Shah
72f6a2432e
Revert "Update notification icon asset names (Email)"
...
Need to revert - doesn't build on Mac OS
This reverts commit cc82965ac9
2014-10-13 18:58:56 +00:00
Rohan Shah
cc82965ac9
Update notification icon asset names (Email)
...
Bug: 17936539
Change-Id: Ia2b3d4a18a30f9cfbfcda2c68a3ef579c0c75086
2014-10-10 15:11:55 -07:00
Martin Hibdon
5fde01e4a9
Merge "Set the search mailbox's syncState as soon as a search is requested" into ub-gmail-ur14-dev
2014-10-10 20:12:43 +00:00
Martin Hibdon
00fbbb24b3
Set the search mailbox's syncState as soon as a search is requested
...
b/15868294
b/17377040
When we do a search, we clear the current contents of the search mailbox,
and then send a request to whatever service is appropriate (IMAP or
Exchange.) The service then begins a sync and updates the sync state.
The thing is, this leaves a time window when the sync state is still
NONE, but no contents have been loaded yet.
So now, as soon as the search request is made, we set the sync state
to LIVE, then send off the request. That should keep the empty state
view hidden until we actually do the sync.
Change-Id: Ia97e1cf2773db460fdf32aaa45205c4e6034527d
2014-10-10 11:35:27 -07:00
Martin Hibdon
89272781fa
EmailProvider now supports query and getType for cached file urls
...
b/17573792
This is needed so that we can send cached files as attachments.
This case comes up if you edit a draft with an attachment,
view the attachment, and then share that with Email.
Also, update the manifest so that EmailProvider grants
uri permission for cachedFiles.
Change-Id: Ib32ae8360b627823af9361cba05e0e5dbd0ae4ca
2014-10-10 11:17:52 -07:00
Tony Mantler
1927361b25
Merge "Account authentication restyling" into ub-gmail-ur14-dev
2014-10-10 16:36:09 +00:00
Régis Décamps
8c0253a1f0
Merge "Replace "Corporate" by "Exchange"." into ub-gmail-ur14-dev
2014-10-10 15:30:39 +00:00
Tony Mantler
746dcf06db
Merge "Restyle account setup flow nav buttons" into ub-gmail-ur14-dev
2014-10-09 18:51:13 +00:00
Tony Mantler
19ebfab06d
Restyle account setup flow nav buttons
...
b/17266006
Change-Id: Ie60e56b493ba23465a06cce8a3c37d3fd9d061e5
2014-10-09 10:38:47 -07:00
Régis Décamps
24f2b19c92
Replace "Corporate" by "Exchange".
...
Bug: 17925116 Change "Corporate" to "Exchange"
Change-Id: Ia7f8a8c2e393924cf13eb9a0895ae29d8acc7eb4
2014-10-09 18:02:34 +02:00
Tony Mantler
f5b5fe1cb3
Account authentication restyling
...
- Add minWidth to fragment
- Remove extraneous LinearLayout and tweak margins to avoid layout jumps
- Change + asset
- Remove old + icon from prefs header from Email
b/8134410
Change-Id: If3371017359b47d9e4280b09fd3bb074b024c23c
2014-10-08 15:49:03 -07:00
Geoff Mendal
2a1daaae4d
Import translations. DO NOT MERGE
...
Change-Id: Id77138c228e8a50336b8a9c6fce144b659fa6d29
Auto-generated-cl: translation import
2014-10-08 10:15:55 -07:00
