Commit Graph

7784 Commits

Author SHA1 Message Date
Paul Westbrook
0a54d7ee81 Merge "increment versionCode" into jb-ub-mail 2012-09-20 09:00:41 -07:00
Paul Westbrook
652a907672 Hide reply all setting on tablets
Since tablets have the space to fit both the reply and reply all buttons
there is no need to show this setting on these devices

Bug: 7190341
Change-Id: I8a911ee964be6af31b63286db53b335a9e4a8396
2012-09-19 23:10:09 -07:00
Paul Westbrook
d4565b3e0d increment versionCode
Change-Id: I9d1eccc6b1dd0bd0fd6b342e6af151630f20a91e
2012-09-19 22:02:44 -07:00
Yorke Lee
4b4d984dd1 Merge "Correct icon for folder/account selection" into jb-ub-mail 2012-09-19 19:11:09 -07:00
Yorke Lee
d33c8de4f0 Correct icon for folder/account selection
Bug: 7180129
Change-Id: I58fab9016e6e1f8be1ce5ac14d9d2e64f8fda051
2012-09-19 18:52:45 -07:00
Baligh Uddin
f432549144 Merge "Import translations. DO NOT MERGE" into jb-ub-mail 2012-09-19 14:01:47 -07:00
Baligh Uddin
ce5901fcf2 Import translations. DO NOT MERGE
Change-Id: I6440dd7def16da46c5c84a695cd13940c46cd0b1
Auto-generated-cl: translation import
2012-09-19 14:01:01 -07:00
Mark Wei
533c4ff919 Merge "Fix Email widget preview using wrong resource." into jb-ub-mail 2012-09-19 13:46:34 -07:00
Marc Blank
67439a3e33 Add translatable=false as required
Bug: 7144392
Change-Id: Ibbe21ea46b443f18795d6266341b9fa995de521e
2012-09-19 13:34:02 -07:00
Marc Blank
72d7dda97d Improve service dump a bit
Change-Id: I850aebae0f8b20f0041672dc36a361c5b2d73f9a
2012-09-19 12:46:13 -07:00
Mark Wei
b2d4258646 Fix Email widget preview using wrong resource.
Bug: 7180129
Change-Id: Iffa4e5d4bd23a3311cec6f567a5b12467e13cde2
2012-09-19 12:06:27 -07:00
Marc Blank
9a6ad1fa10 Merge "Add bugreport dump of wake lock times" into jb-ub-mail 2012-09-19 11:29:40 -07:00
Marc Blank
4639556e52 Add bugreport dump of wake lock times
Change-Id: I4086e8ee620ac10d5a3c1673838c567753c1a553
2012-09-19 11:21:14 -07:00
Paul Westbrook
5e1db519d9 Fix crash when the Email process is killed
If the Email process is killed during setup, the Account information
wouldn't be set.  Specify this information in the intent as the intent will be delivered
again when the activity is restored

This is a short term fix. Ideally we would switch all of the intents for the setup
activities to use these extras to pass this information, or we would save the state of
SetupData in onSaveInstanceState

Bug: 7163201

Change-Id: Ic1758eb031cd113089073d03f3c2571e37a98b23
2012-09-18 21:02:35 -07:00
Paul Westbrook
fb42a915e7 Merge "Fix crash with Email widget" into jb-ub-mail 2012-09-18 18:16:57 -07:00
Paul Westbrook
48b4864840 Fix crash with Email widget
Make sure the projection is correct for the sparse account
cursor

Bug: 7029165
Change-Id: If25ee7718fcd2577320404145de26a859fd4de0a
2012-09-18 18:12:55 -07:00
Mindy Pereira
58e3a2da4c Merge "Return Mindy's senders" into jb-ub-mail 2012-09-18 17:46:41 -07:00
Marc Blank
af7d768e87 Return Mindy's senders
* Also prevent NPE

Bug: 7188573
Change-Id: Ic87e7b3411667262e2aa738a38cb2283c9340b03
2012-09-18 16:26:05 -07:00
mindyp
8ff282a260 Lots of fixes to line up with new multi/single move to folder dialog.
This leaves the picker with radion buttons for choosing the trash
and sent folders for imap.

Change-Id: I11bf32458b4d91bd21f2baf9260a69ac13026aaa
2012-09-18 15:56:53 -07:00
Marc Blank
b203b2b119 Remove useless class and crazy UIDL logging
* The logging makes it very difficult to debug POP3 issues

Change-Id: Ic3ffb9e5b3240918dff3e713fc2a7c49976efe84
2012-09-18 15:07:50 -07:00
Marc Blank
887ea25ed5 Merge "Show display name in convo list" into jb-ub-mail 2012-09-18 11:17:17 -07:00
Marc Blank
d40524bbac Show display name in convo list
Bug: 7170872
Bug: 7144575
Change-Id: Iceaa0616b1fd2db842cd6af0d818a4cc2a2189cc
2012-09-18 11:10:41 -07:00
Marc Blank
eaf7e3bce7 Don't smartsend reply inappropriately
Bug: 7172780
Change-Id: Id43b75efab9c6f7a32e7c6bd42696547cc81f413
2012-09-18 09:47:57 -07:00
Marc Blank
67a33ca9e4 Merge "Properly check for deleted messages" into jb-ub-mail 2012-09-18 09:03:37 -07:00
Marc Blank
e161ca513d Properly check for deleted messages
Bug: 7011707
Change-Id: I9b977774e4b6d201dd96da1675bef7e3de88099c
2012-09-18 08:48:53 -07:00
Paul Westbrook
eb14c19ee6 increment versionCode
Change-Id: I60ebe8705507d1791bb74b7eb8057f35bff987cf
2012-09-17 19:38:21 -07:00
Baligh Uddin
d6e4c7aec9 Merge "Import translations. DO NOT MERGE" into jb-ub-mail 2012-09-17 14:03:03 -07:00
Nick Kralevich
b9929c8ccc DO NOT MERGE Explicitly export content providers
In a future version of Android, the default value for
<provider android:exported> will change from true to false.
Explicitly set android:exported="true"

Bug: 3306452
Change-Id: I9c2e23ab1e55e63bc9ee4fa165a90e566f1911ac
2012-09-17 12:27:01 -07:00
Baligh Uddin
82ab334f7f Import translations. DO NOT MERGE
Change-Id: I9010c2a7bda6d87f915b7184649873641e4f54c2
Auto-generated-cl: translation import
2012-09-17 11:58:16 -07:00
Marc Blank
a1b2b325eb Revert "Export providers explicitly"
This reverts commit a256453a1b

Change-Id: Ibf5dde21a7a4b000cdbec6d7122daaad5914a57b
2012-09-15 18:54:51 -07:00
Marc Blank
a256453a1b Export providers explicitly
Change-Id: I4ddca4b5a295431e799d5a104bd6efd91cda6323
2012-09-15 18:28:40 -07:00
Marc Blank
558a14fc9c Merge "Don't delete smart-forward attachments" into jb-ub-mail 2012-09-15 14:19:08 -07:00
Marc Blank
00d17498c3 Merge "Make sure provider is initialized before setServicesEnabled()" into jb-ub-mail 2012-09-15 14:18:41 -07:00
Marc Blank
93bb868b87 Make sure provider is initialized before setServicesEnabled()
Bug: 7142845
Change-Id: Idf793c5d07e3ea4c4a482696c5a27914fba66022
2012-09-15 10:45:21 -07:00
Marc Blank
4792546584 Don't delete smart-forward attachments
Bug: 7115207
Change-Id: I3f0782a01e9faa83834e5abbaf40cdb2ac0f8718
2012-09-15 10:33:37 -07:00
Baligh Uddin
6171a9fcc5 Merge "Import translations. DO NOT MERGE" into jb-ub-mail 2012-09-14 16:43:45 -07:00
Marc Blank
f53dc340d6 Merge "Prevent infinite loops (ugh); fix list parsing" into jb-ub-mail 2012-09-14 14:54:51 -07:00
Marc Blank
8fe771a9e3 Prevent infinite loops (ugh); fix list parsing
* We weren't accounting for string literals in list
  parsing
* We didn't account for a null result in bodystructure
  parse

Bug: 7162595
Change-Id: Idf0ae135dcfb968c722ab9fb56d5d253e74bd623
2012-09-14 11:51:37 -07:00
Baligh Uddin
9db1132ac7 Import translations. DO NOT MERGE
Change-Id: I8f574861539ec2436d87970808b795a33a16e668
Auto-generated-cl: translation import
2012-09-14 11:48:16 -07:00
Paul Westbrook
f81b540955 Build against the MR1 sdk
Change-Id: I28807529373ea4719a3523425fe0cae878739742
2012-09-14 01:56:17 -07:00
Baligh Uddin
d59dd833a1 Merge "Import translations. DO NOT MERGE" into jb-ub-mail 2012-09-13 22:17:44 -07:00
mindyp
939d15ebbd Bump version
Change-Id: I00712f58951db8472d5c1e9d21be0f7dd513c85b
2012-09-13 18:01:22 -07:00
Marc Blank
be84c68beb Use correct test for updating attachment contentUri
Bug: 7146143
Change-Id: I594c1348f52b9912074f533faece4d0cbf521fbb
2012-09-13 14:07:19 -07:00
Baligh Uddin
78d8312ad8 Import translations. DO NOT MERGE
Change-Id: I1f4bc4f0463e83604acdc70252e3b09a429fcc2b
Auto-generated-cl: translation import
2012-09-13 10:51:34 -07:00
Marc Blank
a98f024b40 Merge "Remove duplicate classes; trim addresses in RCPT TO:" into jb-ub-mail 2012-09-11 19:02:59 -07:00
Marc Blank
787c534f28 Remove duplicate classes; trim addresses in RCPT TO:
Bug: 7133545

Change-Id: Ia1b928083246c5d54a5403b00168a20967517f09
2012-09-11 18:57:14 -07:00
Marc Blank
d14bb10700 Merge "Don't sync at all if 1) upsync and 2) held" into jb-ub-mail 2012-09-11 18:12:16 -07:00
Marc Blank
1bcf32e1b2 Don't sync at all if 1) upsync and 2) held
Bug: 7148468

Change-Id: I93a7734f274263e09ddef1b5cf7d9d7ea58a17c3
2012-09-11 18:07:55 -07:00
mindyp
885a86c4bf Fix swipe settings text
Fixes b/6991536 Swipe conversation strings in settings

Change-Id: I9f4d954665982d1e24e8c7bd4b26ee7da3c9378e
2012-09-11 16:43:12 -07:00
Marc Blank
a1464d13a9 Merge "Bump version" into jb-ub-mail 2012-09-11 10:17:06 -07:00