Commit Graph

4574 Commits

Author SHA1 Message Date
Tony Mantler
fdc8a744b5 am 142f12ea: Merge "Fix IMAP attachment upsync for forwarded messages" into ub-mail-algol
* commit '142f12ea934444e8ecd0a06be4aeb56439546e13':
  Fix IMAP attachment upsync for forwarded messages
2014-04-07 23:57:48 +00:00
Tony Mantler
142f12ea93 Merge "Fix IMAP attachment upsync for forwarded messages" into ub-mail-algol 2014-04-07 23:54:32 +00:00
Tony Mantler
84dfa15541 Fix IMAP attachment upsync for forwarded messages
b/13883967

Change-Id: I496663144c41fa6353883bb77fa35fb14d1cfa07
2014-04-07 16:26:04 -07:00
Martin Hibdon
e48195bfdc am 94acc8e4: Merge "Fix the names of the save state contants" into ub-mail-algol
* commit '94acc8e485dc5fbcd6cf11104a9f2ac9c14f62e5':
  Fix the names of the save state contants
2014-04-07 23:21:16 +00:00
Martin Hibdon
2eb7f1babc Fix the names of the save state contants
b/13624066

Change-Id: I0fabcfbf659e51de3dfe2fc9b72bd88f86e576a6
2014-04-07 15:36:53 -07:00
Martin Hibdon
268b75f818 am a8474c52: Merge "Save and restore sync interval values and strings" into ub-mail-algol
* commit 'a8474c5273f9cfd5e9e4750f9ab9af94f3894635':
  Save and restore sync interval values and strings
2014-04-07 21:14:12 +00:00
Martin Hibdon
a8474c5273 Merge "Save and restore sync interval values and strings" into ub-mail-algol 2014-04-07 21:08:29 +00:00
Martin Hibdon
ddcb95f0e7 Save and restore sync interval values and strings
b/13624066

Change-Id: I14c243a7f7ae71e5d6fbdedda328dc01bb2eae85
2014-04-07 13:30:58 -07:00
Tony Mantler
b09dd77d95 am 6cbdd5bb: Fix more IME actions
* commit '6cbdd5bba0c9c68a3261e54b1cebff48459657d5':
  Fix more IME actions
2014-04-07 16:30:50 +00:00
Tony Mantler
6cbdd5bba0 Fix more IME actions
b/13544189

Change-Id: I5dbbf45a1b68cac2d63ba41c70daff9d33cbb492
2014-04-04 16:36:06 -07:00
Tony Mantler
df2fe89e81 am c9df9390: Make "Manual setup" underlined
* commit 'c9df939011dbb54278afc32f5b4c0fabe940e0d3':
  Make "Manual setup" underlined
2014-04-04 23:18:25 +00:00
Tony Mantler
c9df939011 Make "Manual setup" underlined
That was easier than expected.

b/13814534

Change-Id: I288dc04a91d98800ec351cf1a6ad642755947925
2014-04-04 15:35:52 -07:00
Martin Hibdon
2dfa5cdf3f am 47752716: Merge "Fix a crash signing in with oauth" into ub-mail-algol
* commit '4775271611401a4d9b0c495e7ffe09fffbc1633d':
  Fix a crash signing in with oauth
2014-04-04 22:03:51 +00:00
Martin Hibdon
4775271611 Merge "Fix a crash signing in with oauth" into ub-mail-algol 2014-04-04 21:59:06 +00:00
Martin Hibdon
3144149f73 Fix a crash signing in with oauth
b/13753410

Change-Id: Ie5909b3db9263d261a422e8fe39e424180f326b9
2014-04-04 14:55:13 -07:00
Tony Mantler
1baa2e5324 am a0617312: Merge "More "Manual Setup" button tweaks" into ub-mail-algol
* commit 'a061731281bd437aaec9b7f327b28cd3c246026f':
  More "Manual Setup" button tweaks
2014-04-04 17:48:43 +00:00
Tony Mantler
a061731281 Merge "More "Manual Setup" button tweaks" into ub-mail-algol 2014-04-04 17:43:03 +00:00
Tony Mantler
a67a905542 More "Manual Setup" button tweaks
b/13750692

Change-Id: I8e4c7cc1cb74af16998ec26aae506d30735ed068
2014-04-04 10:10:25 -07:00
Martin Hibdon
0ab326edb4 am 8e456537: Merge "Bound the number of headers we might try to fetch" into ub-mail-algol
* commit '8e456537523966bb72b7cac66b3cb7ec04922562':
  Bound the number of headers we might try to fetch
2014-04-03 21:47:59 +00:00
Martin Hibdon
ec454e092e am 44a443b4: Merge "Make oauth error handling localizable" into ub-mail-algol
* commit '44a443b4e35f68a38ee73b1ce959302b0b3e74b6':
  Make oauth error handling localizable
2014-04-03 21:47:58 +00:00
Martin Hibdon
8e45653752 Merge "Bound the number of headers we might try to fetch" into ub-mail-algol 2014-04-03 21:45:08 +00:00
Martin Hibdon
44a443b4e3 Merge "Make oauth error handling localizable" into ub-mail-algol 2014-04-03 21:44:59 +00:00
Martin Hibdon
8cb95732b0 Make oauth error handling localizable
Also, add some logging to track down b/13545303

Change-Id: I44a0d63b5c3b53018b48eb1c58d6a9ff74bddd9c
2014-04-03 14:28:50 -07:00
Martin Hibdon
7ea823327f Bound the number of headers we might try to fetch
b/13545303
Prior to this change, there is no bound on the number of message
headers we might try to fetch at the same time. Now, we fetch
headers in chunks of limited size.

Change-Id: I06db96eefa8732f970c31fc3617480de40723f2d
2014-04-03 14:23:47 -07:00
Anthony Lee
406c87d852 am e453e7dd: Merge "b/13734162. Make sure that SmartForward is enabled on EAS accounts." into ub-mail-algol
* commit 'e453e7dd29aa5b051cca18670f25e139fb784350':
  b/13734162. Make sure that SmartForward is enabled on EAS accounts.
2014-04-02 23:31:57 +00:00
Tony Mantler
d12032bd09 am 4c6338bf: Make sure HostAuths are populated on manual setup
* commit '4c6338bf1a87fa2829ff788d6493f31e952905aa':
  Make sure HostAuths are populated on manual setup
2014-04-02 23:31:56 +00:00
Tony Mantler
cbc3d6abbc am 68da1ad7: Merge "Add missing call to super.onSaveInstanceState()" into ub-mail-algol
* commit '68da1ad73fcc19efec7b5ef2f3fcd67de19d0d68':
  Add missing call to super.onSaveInstanceState()
2014-04-02 23:31:55 +00:00
Tony Mantler
88ef9a6ce2 am 0976275d: Merge "Change \'Manual setup\' into clickable text instead of a checkbox" into ub-mail-algol
* commit '0976275d7a4854d90d943c50a10d37db2e7f5ece':
  Change 'Manual setup' into clickable text instead of a checkbox
2014-04-02 23:31:55 +00:00
Tony Mantler
1498223043 am 1a9c5fe7: Fix automatic account creation
* commit '1a9c5fe7ade0c95c155e9b8dade7b7e1ee3cb6f5':
  Fix automatic account creation
2014-04-02 23:31:54 +00:00
Martin Hibdon
3ec20d5eeb am 0db900d6: Merge "Allow setting of the sync window for IMAP accounts" into ub-mail-algol
* commit '0db900d62247b66b3de2eb665145e239141e670e':
  Allow setting of the sync window for IMAP accounts
2014-04-02 22:57:08 +00:00
Tony Mantler
77c20133ba am ecd23cf0: Check amProtocol for empty before assuming the user picked a different protocol
* commit 'ecd23cf0f29c10c11c6af5022de81be7757b6017':
  Check amProtocol for empty before assuming the user picked a different protocol
2014-04-02 22:57:06 +00:00
James Lemieux
5b24227741 am f456b4f9: Merge "Show "To:<Names>" in sent and outbox index views" into ub-mail-algol
* commit 'f456b4f9d49ebc2ffaf191e8faa55ec73fcb3814':
  Show "To:<Names>" in sent and outbox index views
2014-04-02 22:56:58 +00:00
James Lemieux
ef2d771252 am 603d1bfa: Merge "Fix an out-of-date comment." into ub-mail-algol
* commit '603d1bfa5ed12fa3a54c660ac4cc0c753e0cde8e':
  Fix an out-of-date comment.
2014-04-02 22:56:57 +00:00
Anthony Lee
10318650a6 am 8a5a5779: Merge "b/13659368. Ensure properly download status for attachments on failures." into ub-mail-algol
* commit '8a5a5779a3072ed4d1372c64e694e8fbad6cf76c':
  b/13659368. Ensure properly download status for attachments on failures.
2014-04-02 22:56:56 +00:00
Tony Mantler
757656742e am 296cde56: Add disambiguation screen when user protocol choice differs from providers.xml
* commit '296cde560348435ba2a64cc9ac308115721b88b3':
  Add disambiguation screen when user protocol choice differs from providers.xml
2014-04-02 22:56:53 +00:00
Tony Mantler
538bb718af am ca7df3f2: Begone, foul keyboard!
* commit 'ca7df3f234b0434caab0ca9149b19bad9955777a':
  Begone, foul keyboard!
2014-04-02 22:56:52 +00:00
James Lemieux
1d074abc2c am 5057d6df: Replying to a Message with an encoded email address shows the encoded address in the to field.
* commit '5057d6dffb994b4d1d02c05e06f679de8ef05ea5':
  Replying to a Message with an encoded email address shows the encoded address in the to field.
2014-04-02 22:56:50 +00:00
Anthony Lee
e453e7dd29 Merge "b/13734162. Make sure that SmartForward is enabled on EAS accounts." into ub-mail-algol 2014-04-02 22:08:04 +00:00
Anthony Lee
6f7c1c824d b/13734162. Make sure that SmartForward is enabled on EAS accounts.
This is an Algol only fix that needs to be reconsidered for L.
The fix comes in 2 parts. The first addresses existing accounts.
The second addresses new accounts. First we check that the protocol
is EAS and then we check the protocol version to be greater than
12.0 before setting the flags. In the future, the protocol specific
flags should be set in the protocol specific components.

Change-Id: I00a6fa3337d5230801f6de8876332c66deeae2c4
2014-04-02 14:07:41 -07:00
Tony Mantler
4c6338bf1a Make sure HostAuths are populated on manual setup
b/13751284

Change-Id: I61aa94e7ebedc5550854731caa068b9e577c2b3b
2014-04-02 13:30:51 -07:00
Tony Mantler
68da1ad73f Merge "Add missing call to super.onSaveInstanceState()" into ub-mail-algol 2014-04-01 23:00:43 +00:00
Tony Mantler
0976275d7a Merge "Change 'Manual setup' into clickable text instead of a checkbox" into ub-mail-algol 2014-04-01 22:56:52 +00:00
Tony Mantler
14178ca1e3 Add missing call to super.onSaveInstanceState()
b/13750715

Change-Id: I328e25f355b60217b2dbc874fff9bd3742e79f90
2014-04-01 15:55:51 -07:00
Tony Mantler
1a9c5fe7ad Fix automatic account creation
b/13695686

Change-Id: I108989e50337a839c42fdff1cc11697d8adee954
2014-04-01 15:10:18 -07:00
Tony Mantler
392c263c19 Change 'Manual setup' into clickable text instead of a checkbox
b/13733521

Change-Id: I7f338cbfb8357c5e1a27c6e886ea96e5c6924d22
2014-04-01 14:11:15 -07:00
Martin Hibdon
0db900d622 Merge "Allow setting of the sync window for IMAP accounts" into ub-mail-algol 2014-04-01 19:54:31 +00:00
Martin Hibdon
c0d94a44ea Allow setting of the sync window for IMAP accounts
b/13362667
Really this is just for testing, the only window setting
that has any affect is SYNC_WINDOW_ALL. At some point we
should revisit the imap sync window strategy, right now
we will sync up to the oldest message currently on the
device, which is potentially a large amount of data.

Change-Id: I00dd59bd084e85bdf80f3991062b84fcd6a12362
2014-04-01 12:17:34 -07:00
Tony Mantler
ecd23cf0f2 Check amProtocol for empty before assuming the user picked a different protocol
b/13734367

Change-Id: I36514cedc31f9a02c627e921b37fdb500d0ab74c
2014-03-31 16:43:14 -07:00
James Lemieux
f456b4f9d4 Merge "Show "To:<Names>" in sent and outbox index views" into ub-mail-algol 2014-03-31 21:11:40 +00:00
James Lemieux
603d1bfa5e Merge "Fix an out-of-date comment." into ub-mail-algol 2014-03-31 21:11:19 +00:00
James Lemieux
974ccb1735 Fix an out-of-date comment.
The code related to the comment didn't ship as part of Kitkat MR2 and instead will go out with the platform L release.

Change-Id: Ib9ece3390005b5b0217e0c5540322802b1c096ad
2014-03-31 21:09:51 +00:00
Anthony Lee
8a5a5779a3 Merge "b/13659368. Ensure properly download status for attachments on failures." into ub-mail-algol 2014-03-31 20:47:27 +00:00
Anthony Lee
b6125ae385 b/13659368. Ensure properly download status for attachments on failures.
The reason why the UI is wedged is becasue it doesn't
see a state transition in the status. So now we detect the situation
where the user is trying to download an ineligible file and force
the status to indicate that it was a failure to dismiss the UI and
to show the correct error message.

Change-Id: I9264966830a317724bf2fe469ae570860ba7c2a9
2014-03-31 13:21:28 -07:00
James Lemieux
469c426376 Show "To:<Names>" in sent and outbox index views
b/13304929

The solution being delivered introduces a new folder capability:
UIProvider.FolderCapabilities.SHOW_RECIPIENTS which indicates a folder
should display "To: " in front of its participants list because it
is a folder containing outgoing mail or sent mail (thus viewing
recipients is more useful than senders). This capability is returned
for Drafts, Sent, and Outbox.

Note that extra work was required to make this function properly in
the widget we export to the launcher. See BaseWidgetProvider and
friends for details.

Change-Id: Ie7b077b8dd8934182de5e94a90fa163e8105faac
2014-03-31 12:35:15 -07:00
Tony Mantler
296cde5603 Add disambiguation screen when user protocol choice differs from providers.xml
b/13640868

Change-Id: I75116f30e9c12d2e8b6757bf208e1519e438aed9
2014-03-28 17:08:04 -07:00
Tony Mantler
ca7df3f234 Begone, foul keyboard!
Hide keyboard when advancing setup screens

b/13640446

Change-Id: I913a6afe9bcd4864bf218cab59a3d9e84b23f7d9
2014-03-28 11:20:23 -07:00
James Lemieux
5057d6dffb Replying to a Message with an encoded email address shows the encoded address in the to field.
b/11658428

As per Yu Ping's advice, we alter the storage of all email addresses (from, to, cc, bcc and
replyto) to be stored in *decoded* format within our database. This makes them both human
readable when inspecting the database manually and alleviates the need to repeatedly decode
them before they are displayed anywhere in our UI layers.

As part of this bugfix, I resurrected several tests related to the LegacyConversions class out of
LegacyConversionsTests and into a new (not Suppressed) test class: LegacyConversionsTest

Change-Id: Ie2e3264646e25c08c4ba74f60b3e1090c052e6c6
2014-03-27 23:25:53 +00:00
Martin Hibdon
c7031638bd Minor formatting change
b/13642247

Change-Id: I02e495142d8043c8749ab0bce21f4c7c1cea7a5f
(cherry picked from commit 64b4f7dcff)
2014-03-27 21:30:37 +00:00
Martin Hibdon
23ff99df9d Merge "Fix IMAP message upsync to include attachments." into ub-mail-algol 2014-03-27 21:30:08 +00:00
Tony Mantler
38f9991634 Fix IMAP message upsync to include attachments.
b/13138456

Change-Id: If16b619a650c640a37cb4563750a6327a5e601e6
(cherry picked from commit 0c8696c2eb)
2014-03-27 21:23:32 +00:00
Martin Hibdon
e5d754e16c Fix a NPE trying to download an attachment
b/13642247

Change-Id: I4cfb7e4a3be12fdc8b8c345c1aeabd85a729d16a
(cherry picked from commit adabb4285b)
2014-03-27 21:22:28 +00:00
Anthony Lee
30dc25c390 am 41e3f37b: Merge "b/13659097. Disable EAS Policy max attachment size from EmailProvider." into ub-mail-algol
* commit '41e3f37b501ea787c6569f4ac22a11d269dd6557':
  b/13659097. Disable EAS Policy max attachment size from EmailProvider.
2014-03-27 18:46:13 +00:00
Anthony Lee
a68ab80305 b/13659097. Disable EAS Policy max attachment size from EmailProvider.
Disable the code that translates the max attachment size column of
our db to the EmailProvider max attachment size column. They mean
different things as our max attachment size column refers to the max
size of any file that we can download where the EmailProvider's version
represents the max attachment size of a file that we can upload.

Change-Id: I93202766d7b1782c902f17ce20b2823aaf647ec4
2014-03-27 11:37:41 -07:00
Tony Mantler
2be297f1ba Merge "Fix IMAP message upsync to include attachments." into ub-mail-master 2014-03-26 19:53:57 +00:00
Tony Mantler
0c8696c2eb Fix IMAP message upsync to include attachments.
b/13138456

Change-Id: If16b619a650c640a37cb4563750a6327a5e601e6
2014-03-26 11:49:38 -07:00
Martin Hibdon
77ba9a751f Merge "Minor formatting change" into ub-mail-master 2014-03-26 18:03:09 +00:00
Martin Hibdon
64b4f7dcff Minor formatting change
b/13642247

Change-Id: I02e495142d8043c8749ab0bce21f4c7c1cea7a5f
2014-03-26 10:47:54 -07:00
Martin Hibdon
a44a63e273 Merge "Fix a NPE trying to download an attachment" into ub-mail-master 2014-03-26 17:46:58 +00:00
Martin Hibdon
adabb4285b Fix a NPE trying to download an attachment
b/13642247

Change-Id: I4cfb7e4a3be12fdc8b8c345c1aeabd85a729d16a
2014-03-26 10:38:51 -07:00
Andy Huang
5687c6dade tighten inline attachment view intent builder
Bug: 7659807
Change-Id: I845199fd6848cb5c0a7ebfd2f63f8c3045fffa36
2014-03-25 13:30:16 -07:00
Martin Hibdon
3f4a556d54 Fix Calendar and Contacts syncing for POP and IMAP accounts
b/11818312

Change-Id: I34b82040991506bf9099cc0df237454a8f97c764
2014-03-24 17:17:05 -07:00
Martin Hibdon
3021a60bc7 Merge "Only make Calendar and Contacts syncable on Exchange" into ub-mail-master 2014-03-20 19:57:05 +00:00
Martin Hibdon
6a51abdf6e Only make Calendar and Contacts syncable on Exchange
b/11818312
We were using the existance of OPTIONS_CALENDAR_SYNC in the
bundle to indicate that syncing was possible, and it's value
to indicate whether automatic syncing should be enabled.
This is misleading.
Now, we check the serviceInfo for the account type to figure
out if sync calendar and contacts is possible, and use the
options passed in to indicate whether or not it should be
automatic.

Change-Id: I776519668c6630dc71153fb008218a7ca6357c74
2014-03-20 12:47:36 -07:00
Anthony Lee
eba80c114e b/9564335. Add support for a maxAttachmentSize column in the Account
table and connect the data to the Settings object in the existing
location (SettingsColumns.MAX_ATTACHMENT_SIZE).

Change-Id: Iaf48995757511e1dfb65aa35ff6d81bbc47187bd

Conflicts:
	src/com/android/email/provider/DBHelper.java
2014-03-19 17:33:29 -07:00
Yu Ping Hu
8103f960d0 Add sync to IEmailService.
This supports the EasService design.

Yes, I just removed a startSync function from this interface last month. No,
I didn't quite know at the time that I'd be adding one back. :)

Change-Id: I19d9c7838473d8982560764fdba0056cba03d132
(cherry picked from commit 4a5b11d650)
2014-03-20 00:11:36 +00:00
Anthony Lee
70cb2878d7 Changed the IEmailService interface to accept and accountId in
the loadAttachment() call. This work was necessary to support
the new EasService & EasOperation infrastructure.

Change-Id: Idd507aec999596ccd4afa5f03ff2b3c2e38a9029
(cherry picked from commit efac8255ed75d22e60036e19e7a95f8407d18ad3)
2014-03-19 23:53:28 +00:00
Yu Ping Hu
701134953e Add pushModify to IEmailService.
This call lets the service know that the push settings for an
account have changed.

Change-Id: I7ed41853df6af6762c80283a2a3510ce41551657
(cherry picked from commit 446136a2278652c627068ecddff534de1ad431ab)
2014-03-19 23:51:14 +00:00
Tony Mantler
c90680915d Merge "Fix setup flow dialog dismissal" into ub-mail-master 2014-03-19 23:35:36 +00:00
Yu Ping Hu
f679cd08d1 Delete unused functions from IEmailService.aidl.
Change-Id: I131d2d3436a50c94d664fc57c6514481d9afbc97
(cherry picked from commit 8ff6c107867bc2044ba50cad010dbf4a2e93436e)
2014-03-19 22:35:47 +00:00
Tony Mantler
254dde761f Fix setup flow dialog dismissal
Also remove redundant ok/cancel strings

b/13512724

Change-Id: Idfc7745fbf6a08f09051eb4a6154fc446b43eb67
2014-03-19 15:23:56 -07:00
Tony Mantler
cc82c7bae2 Fix IME "Next" button handling in credentials screen
b/13544867

Change-Id: I63ba680a5551dd4bd860026b9110b20a2ae080b6
2014-03-19 11:13:04 -07:00
Tony Mantler
e93b81a51a Merge "Fix back button handling on protocol choice screen" into ub-mail-master 2014-03-19 17:25:47 +00:00
Tony Mantler
b5a4433798 Fix back button handling on protocol choice screen
b/13543514

Change-Id: I27078220aca60ac5137fc69e34e52937313602c9
2014-03-19 10:09:24 -07:00
Tony Mantler
d90643c732 Move credential population to after we collect credentials
b/13512724

Change-Id: I2df8064fc392a928d77291aa41630e4715bedc39
2014-03-18 16:46:33 -07:00
Tony Mantler
452744474a Fix broken tests and remove dead code
Change-Id: I3ae31c604c86641622f997915dc7d86bf2c662a2
2014-03-18 13:57:11 -07:00
Tony Mantler
ae980cd685 Account setup flow: Move button and headline handling into fragments
b/13508015

Change-Id: I9f7a09467fbee5a57985f36eaa47c2cc7b9d4086
2014-03-17 16:45:47 -07:00
Tony Mantler
7fbf3ac6d1 Merge "Skip protocol choice if user entered from system account manager" into ub-mail-master 2014-03-14 23:11:37 +00:00
Tony Mantler
53b64eee54 Skip protocol choice if user entered from system account manager
b/13475223

Change-Id: Id1ec6259e2b3880f9ce83ffe7795c40aa069466e
2014-03-14 15:48:10 -07:00
Andrew Sapperstein
98ade11ad6 Merge "Send empty data for permalink/clipped fields." into ub-mail-master 2014-03-14 22:16:38 +00:00
Tony Mantler
282edb95a3 Add an alternate force-create account path
Allows auto-filling account details using providers.xml

b/13456413

Change-Id: I1d7f6346e2f1d1cc339610be68ff7194210bc75c
2014-03-13 16:21:06 -07:00
Tony Mantler
250d2f9fb8 Merge "Move protocol selection before credential collection" into ub-mail-master 2014-03-13 22:00:25 +00:00
James Lemieux
2c74c0efae Merge "Move Help & feedback to Nav drawer." into ub-mail-master 2014-03-13 21:45:54 +00:00
Tony Mantler
d2ffe23fca Move protocol selection before credential collection
b/13454985

Change-Id: Iabaf74e3212bb2e3b02e55ec947f0e9a32b597e5
2014-03-13 14:11:06 -07:00
Tony Mantler
f6a945a6cf Clean up cert handling in AccountSetupCredentialsFragment
b/13453003

Change-Id: I87567c7e5cb39c7366c8ed346b0e300c3fc6da16
2014-03-13 11:30:25 -07:00
Tony Mantler
e31979ae2e Tweak conditions for diverting back to the password screen
b/13451098

Change-Id: Id0422342aeac3647324afd8e41f6611069a27aad
2014-03-13 10:56:24 -07:00
James Lemieux
31ce5555b8 Move Help & feedback to Nav drawer.
b/11061485

HELP and SEND FEEDBACK are now the two bottom-most drawer
items in the Navigation drawer when it is present or in
the overflow menu when it is not present.

SEND FEEDBACK still behaves as always.

HELP has been redesigned so that it displays the help
content in a local webview rather than using an external
browser.

Change-Id: I01003f3cd6f8dedbcfb95ae87872968dfc6be48b
2014-03-12 16:56:56 -07:00
Martin Hibdon
351aa25ccb Merge "Add the password failed warning text" into ub-mail-master 2014-03-12 22:21:26 +00:00
Martin Hibdon
40baa96c3f Add the password failed warning text
Now, if you fail to authenticate on the credentials fragment,
instead of taking you to the full accountSetupIncoming,
it just takes you back to the credentials fragment with
a warning that your password is wrong.
Also, make it so that pressing "next" on the password IME behaves
the same as pressing the Next button.

Change-Id: Ice91c842659c33ba6f8ac876356a79265c703e2e
2014-03-12 15:19:11 -07:00
Tony Mantler
cac33a2e91 Allow entry into account settings when inbox is null
b/13436061

Change-Id: I544aa55000a91fe121de9bc7963eb89115d4758d
2014-03-12 15:05:50 -07:00
Tony Mantler
ee9cdebcb2 Merge "When opening account settings, divert to AccountSecurity if needed" into ub-mail-master 2014-03-12 20:53:05 +00:00