Commit Graph

7769 Commits

Author SHA1 Message Date
Paul Westbrook
46ef3570b5 am 7e6a7e06: am 779fe020: First part of switching Email to use ContentResolver#call
* commit '7e6a7e0661080ae4560e6bab7fef52877c55ad23':
  First part of switching Email to use ContentResolver#call
2013-02-22 22:28:08 +00:00
Paul Westbrook
7e6a7e0661 am 779fe020: First part of switching Email to use ContentResolver#call
* commit '779fe0200300978e28a0b8a904817bdc5e587cad':
  First part of switching Email to use ContentResolver#call
2013-02-22 22:25:25 +00:00
Paul Westbrook
779fe02003 First part of switching Email to use ContentResolver#call
This CL includes the call() support.  Subsequent CLs will remove the
deprecated UI provider uris, will add attachment caching to Email

Bug: 7381557
Change-Id: Iff59c7c0503c6e9ccda1d15954f72ffa78331b4e
2013-02-22 10:09:03 -08:00
Yu Ping Hu
a10fcade78 am 0e0670f7: am 51243313: Merge "Fix how visibleLimit for a Mailbox is set." into jb-ub-mail-ur9
* commit '0e0670f7575baca3346809f2b04b7b625fa4bebe':
  Fix how visibleLimit for a Mailbox is set.
2013-02-16 03:04:29 +00:00
Yu Ping Hu
0e0670f757 am 51243313: Merge "Fix how visibleLimit for a Mailbox is set." into jb-ub-mail-ur9
* commit '512433135c184d6c19c8b58dac7b33315ac511dd':
  Fix how visibleLimit for a Mailbox is set.
2013-02-16 03:02:41 +00:00
Yu Ping Hu
512433135c Merge "Fix how visibleLimit for a Mailbox is set." into jb-ub-mail-ur9 2013-02-16 03:01:08 +00:00
Yu Ping Hu
66eef4565d Fix how visibleLimit for a Mailbox is set.
- Make sure visibleLimit stays <= totalCount.
- Don't reset it to 0 every time user enters a folder.

Also sets Folder.totalCount = Mailbox.folderCount
(rather than Mailbox.messageCount).

BUG: 7480726
Change-Id: Iae084d9445f483dca2b1da052ffd4dd7d091c6f6
2013-02-15 17:02:40 -08:00
Scott Kennedy
7570b6aef7 am 4b5c4b96: am 2f9c66d0: Use swipe preference for archive/delete action
# Via Android Git Automerger (1) and Scott Kennedy (1)
* commit '4b5c4b9697192d6b9634e442465877303b1b2a68':
  Use swipe preference for archive/delete action
2013-02-15 00:47:49 +00:00
Scott Kennedy
4b5c4b9697 am 2f9c66d0: Use swipe preference for archive/delete action
# Via Scott Kennedy
* commit '2f9c66d08b13c1ed4eb7d2f70baa98116ac5fcfb':
  Use swipe preference for archive/delete action
2013-02-15 00:43:43 +00:00
Scott Kennedy
2f9c66d08b Use swipe preference for archive/delete action
Since some people prefer delete over archive, we will use their
conversation list swipe preference to determine whether to show
a "Delete" action or an "Archive"/"Remove label" action. "Delete"
will be shown if they have selected "Always delete"

UR9 version of I4eb0d408474a9f613cc4267c3851cc7277a22ebd

Change-Id: Ia2f1382b88c1ee6f64e864cb8b780d02821b673d
2013-02-14 14:46:02 -08:00
Baligh Uddin
091279b5dd am 624d8c50: (-s ours) am 82eadd60: (-s ours) am d384fcbf: (-s ours) Import translations. DO NOT MERGE
# Via Android Git Automerger (2) and Baligh Uddin (1)
* commit '624d8c5026311ad652874ae434c690977273c699':
  Import translations. DO NOT MERGE
2013-02-14 04:42:41 +00:00
Baligh Uddin
624d8c5026 am 82eadd60: (-s ours) am d384fcbf: (-s ours) Import translations. DO NOT MERGE
# Via Android Git Automerger (1) and Baligh Uddin (1)
* commit '82eadd601ad350c54939af485d7bc15ab66abc36':
  Import translations. DO NOT MERGE
2013-02-14 04:40:33 +00:00
Baligh Uddin
82eadd601a am d384fcbf: (-s ours) Import translations. DO NOT MERGE
# Via Baligh Uddin
* commit 'd384fcbffa410bbc6d07e4d3c29a20ef1dd41567':
  Import translations. DO NOT MERGE
2013-02-12 15:28:29 -08:00
Baligh Uddin
d384fcbffa Import translations. DO NOT MERGE
Change-Id: I029ab00baae5e7367ebb0e6a2bf4aed328b22e35
Auto-generated-cl: translation import
2013-02-12 13:00:18 -08:00
Vikram Aggarwal
132a3f0977 Merge "Add user assignable category for mail foldders if it accepts moved messages" into jb-ub-mail-ur9 2013-02-11 17:03:46 +00:00
Baligh Uddin
efb090087b am 136378e4: (-s ours) Import translations. DO NOT MERGE
# Via Baligh Uddin
* commit '136378e404278cb86f0b1a7d09f56cb2f5fd3199':
  Import translations. DO NOT MERGE
2013-02-08 11:51:50 -08:00
Baligh Uddin
136378e404 Import translations. DO NOT MERGE
Change-Id: I187dd578bdf665270320be4fc46b61f9dd89bbd4
Auto-generated-cl: translation import
2013-02-08 11:40:05 -08:00
Rohan Shah
5ba32cc2b9 Add user assignable category for mail foldders if it accepts moved messages
Email requires a user assignable category in the case
the user is moving labels/folders from a category the
user should not be allowed to view (i.e. sys labels).

Change added flag under function where if it allows
moved messages, it will allow the user to assign
there as well.

Bug: 8157593

Change-Id: Icc8a5d4587ef9180d32207613da4f31ddc8854f1
2013-02-08 11:19:11 -08:00
Scott Kennedy
b34608228f Move notifications to UnifiedEmail
This involves redoing the persistence model, to split general,
account, and folder settings into separate SharedPreference stores.

It also requires some preferences to be moved into UnifiedEmail.

Depends on Ibe2e3f93ec164370535ffc5f5b2409544cc8d36d (UnifiedEmail)

Change-Id: Ie6ec389b5b5d2e7ab1b299d0877811ae716526e2
2013-02-08 09:48:22 -08:00
Baligh Uddin
19b77bfe12 am 584c0a8e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur8
# Via Android (Google) Code Review (1) and Baligh Uddin (1)
* commit '584c0a8e28e377c25762c0650f17ba39441a13a4':
  Import translations. DO NOT MERGE
2013-02-07 18:07:36 -08:00
Baligh Uddin
584c0a8e28 Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur8 2013-02-08 02:05:32 +00:00
Scott Kennedy
a5abf7b338 am 7fdde9bb: Cache column name/indexes so we can use getColumnIndex()
# Via Scott Kennedy
* commit '7fdde9bb4a24e931618a7a64227e2194c89034da':
  Cache column name/indexes so we can use getColumnIndex()
2013-02-06 17:26:30 -08:00
Scott Kennedy
7fdde9bb4a Cache column name/indexes so we can use getColumnIndex()
MatrixCursor doesn't do this, so we need to add our own cache.

Depends on Ia5ffd31f54a2a335f495df5e0d1a0886ee08c14b

Change-Id: Ica78e3cec747bf86fcef16508156e359216c64fe
2013-02-06 17:09:42 -08:00
Baligh Uddin
e5198e1d5e Import translations. DO NOT MERGE
Change-Id: I724599f777c178f00d77c12c23c73b78f7629cc8
Auto-generated-cl: translation import
2013-02-06 15:26:03 -08:00
Baligh Uddin
81167c655d am 80b5bb3d: (-s ours) Import translations. DO NOT MERGE
# Via Baligh Uddin
* commit '80b5bb3dfce7b11b56d8d493ed7b66a0aba8e0c1':
  Import translations. DO NOT MERGE
2013-02-05 12:16:41 -08:00
Baligh Uddin
80b5bb3dfc Import translations. DO NOT MERGE
Change-Id: I57772fbb48c6bae863f3508f6e068ece9ca49980
Auto-generated-cl: translation import
2013-02-04 10:29:16 -08:00
Baligh Uddin
41116bfece am 02a834eb: (-s ours) Import translations. DO NOT MERGE
# Via Baligh Uddin
* commit '02a834eb5a9384acc6a69f04c123a57ca9c78356':
  Import translations. DO NOT MERGE
2013-02-01 10:34:40 -08:00
Baligh Uddin
02a834eb5a Import translations. DO NOT MERGE
Change-Id: Ia83fe242765fd3d18fe70d48a54425a9bc449cf4
Auto-generated-cl: translation import
2013-02-01 09:13:54 -08:00
Vikram Aggarwal
b249e71e02 am afbee625: Remove nonexistant classes and update existing ones
# Via Vikram Aggarwal
* commit 'afbee625adbb5d1473b37c55e0e3cdf418d29957':
  Remove nonexistant classes and update existing ones
2013-01-30 16:29:23 -08:00
Vikram Aggarwal
afbee625ad Remove nonexistant classes and update existing ones
Change-Id: I09e2747030eca6248d51f70b2d3ce3aa3db26091
2013-01-30 14:20:58 -08:00
Baligh Uddin
a5ee46023f am 38172a18: (-s ours) Import translations. DO NOT MERGE
# Via Baligh Uddin
* commit '38172a183b6fb84fe3c2b6751f624394a8764c7d':
  Import translations. DO NOT MERGE
2013-01-30 12:13:17 -08:00
Baligh Uddin
38172a183b Import translations. DO NOT MERGE
Change-Id: I7b36eae4699ad09e64c413389520b12fb5a18737
Auto-generated-cl: translation import
2013-01-30 11:24:12 -08:00
Vikram Aggarwal
15056dedc5 am fb4cc403: Check tablet mode through resources
# Via Vikram Aggarwal
* commit 'fb4cc403514e4d98e63f86ed9d5fa2ac442073d0':
  Check tablet mode through resources
2013-01-28 18:10:31 -08:00
Vikram Aggarwal
fb4cc40351 Check tablet mode through resources
Change-Id: I1f29bce68a5736e00e38b5f0189c025bfbae433c
2013-01-28 18:05:42 -08:00
Vikram Aggarwal
d02b69c5cc am 4b09765a: Added veiled pattern updates through provider
# Via Vikram Aggarwal
* commit '4b09765a2e8a0fd22a9db0e876aaaada4246aff8':
  Added veiled pattern updates through provider
2013-01-28 18:03:21 -08:00
Vikram Aggarwal
4b09765a2e Added veiled pattern updates through provider
Change-Id: I09cef0865e3d29f44a93a3887ff72676ab868b14
2013-01-28 11:54:10 -08:00
Baligh Uddin
82bd2edffc am 89bf520f: (-s ours) Import translations. DO NOT MERGE
# Via Baligh Uddin
* commit '89bf520fdce86d97293db83b7c8f9baf4c795069':
  Import translations. DO NOT MERGE
2013-01-28 10:52:06 -08:00
Baligh Uddin
89bf520fdc Import translations. DO NOT MERGE
Change-Id: I261fc15c5bc006552b20a2d220d527292ede21b7
Auto-generated-cl: translation import
2013-01-28 09:16:48 -08:00
Paul Westbrook
04d26323d9 am 632ab1d6: (-s ours) DO NOT MERGE Revert "Change "hide checkboxes" to "show checkboxes""
* commit '632ab1d6339ca038287fb999d98ee0b78ca7cedd':
  DO NOT MERGE Revert "Change "hide checkboxes" to "show checkboxes""
2013-01-23 11:44:20 -08:00
Paul Westbrook
632ab1d633 DO NOT MERGE Revert "Change "hide checkboxes" to "show checkboxes""
This reverts commit 5742d44917.
2013-01-23 10:16:06 -08:00
Baligh Uddin
a16dd46c95 am 62972edd: (-s ours) Import translations. DO NOT MERGE
* commit '62972eddcec8d40c36558fdfacec4d21e121645c':
  Import translations. DO NOT MERGE
2013-01-15 09:37:04 -08:00
Baligh Uddin
b3cf738aa5 Import translations. DO NOT MERGE
Change-Id: I337ed8b8a87953463133f90805202bada4cff5d9
Auto-generated-cl: translation import
2013-01-14 16:03:43 -08:00
Baligh Uddin
62972eddce Import translations. DO NOT MERGE
Change-Id: If0a2e798d565d1edb12c2319eb6a5a984e1ffee2
Auto-generated-cl: translation import
2013-01-14 16:02:48 -08:00
Baligh Uddin
0b44cebb15 am 2c9f5547: (-s ours) Import translations. DO NOT MERGE
* commit '2c9f5547e77e83ebf23da4b47f79d31577067163':
  Import translations. DO NOT MERGE
2013-01-09 14:18:03 -08:00
Baligh Uddin
ae33ce14f4 Import translations. DO NOT MERGE
Change-Id: Ibc5687adea86d2b07df3357b1ce919839a6ce070
Auto-generated-cl: translation import
2013-01-09 12:30:19 -08:00
Baligh Uddin
2c9f5547e7 Import translations. DO NOT MERGE
Change-Id: Iff6daff25b95080f81b3e403587aa60821ca41bf
Auto-generated-cl: translation import
2013-01-09 12:29:11 -08:00
Scott Kennedy
12d85ded73 am 5742d449: Change "hide checkboxes" to "show checkboxes"
* commit '5742d449178fd51cfea303280e6c7b327f087f9a':
  Change "hide checkboxes" to "show checkboxes"
2013-01-07 18:21:40 -08:00
Scott Kennedy
5742d44917 Change "hide checkboxes" to "show checkboxes"
Change-Id: Ie44dc65acab4ed94e8d7b3b26392872c4419a603
2012-12-21 12:24:26 -08:00
Paul Westbrook
962267c747 am 8552a4f4: build against framework/opt\'s photo viewer
* commit '8552a4f4a6fd54f759292e66c440f71b3fe9f152':
  build against framework/opt's photo viewer
2012-12-19 15:12:55 -08:00
Paul Westbrook
8552a4f4a6 build against framework/opt's photo viewer
Bug: 7379833
Change-Id: I5fbf0450ac5fee772fc2044aa2c6b01b4c38f004
2012-12-19 15:03:40 -08:00