Andrew Sapperstein
1b76146c22
am 2ad2f0d1
: Merge "Use support lib gridlayout." into jb-ub-mail-ur10
...
* commit '2ad2f0d145fd2e0e0e2a25c68facac6ac57e9c09':
Use support lib gridlayout.
2013-08-28 10:50:13 -07:00
Andrew Sapperstein
2ad2f0d145
Merge "Use support lib gridlayout." into jb-ub-mail-ur10
2013-08-28 17:43:27 +00:00
Andrew Sapperstein
fb10b5eb2d
am 4f748b4c
: Merge "Show action bar title in eml viewer. b/10515249." into jb-ub-mail-ur10
...
* commit '4f748b4c590711fac1241fbf1d1c7e98650561cd':
Show action bar title in eml viewer. b/10515249.
2013-08-28 10:31:53 -07:00
Andrew Sapperstein
4f748b4c59
Merge "Show action bar title in eml viewer. b/10515249." into jb-ub-mail-ur10
2013-08-28 17:30:16 +00:00
Andrew Sapperstein
a3da2975e8
Show action bar title in eml viewer. b/10515249.
...
Change-Id: I5889a3b645f3792e881c746f8e4bdfc04d12a922
2013-08-28 10:20:13 -07:00
Baligh Uddin
d32999d129
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11
2013-08-28 04:45:45 +00:00
Baligh Uddin
4ee66339b8
am a106effa
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
...
* commit 'a106effacced9c910a45e073b86160d0535e201e':
Import translations. DO NOT MERGE
2013-08-27 20:54:01 -07:00
Baligh Uddin
a106effacc
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
2013-08-28 03:51:59 +00:00
Andrew Sapperstein
2c56354d4c
Use support lib gridlayout.
...
Change-Id: I6eef37481bd8a97312a3646374d4aad4027d4e5c
2013-08-27 17:40:28 -07:00
Martin Hibdon
1d8dddabce
am 0c8df56a
: When loading local messages, don\'t filter messages by time
...
* commit '0c8df56a0aed5b97aee2031ccbce75762097b1d1':
When loading local messages, don't filter messages by time
2013-08-27 16:10:46 -07:00
Martin Hibdon
0c8df56a0a
When loading local messages, don't filter messages by time
...
b/10508861
Temporary fix for this.
For some reason, we're getting messages loaded with the wrong
date being stored. If we have a message with date = 0, and we
filter out anything older than 24 hours, then these messages
with the wrong date won't get loaded into our localMessageMap.
Then we won't recognize that message is already present locally,
and we will fetch a duplicate.
I don't yet know why we're getting the date wrong.
Change-Id: Ic91cd263198ee944eddbaf1d90080e8285a5df6a
2013-08-27 15:50:09 -07:00
Tony Mantler
2dda90f31e
am 7be030ec
: Remove pointless parent class EmailPreferenceFragment
...
* commit '7be030ec8e31c53da8bde54b040e64546727ef61':
Remove pointless parent class EmailPreferenceFragment
2013-08-27 14:30:05 -07:00
Tony Mantler
7be030ec8e
Remove pointless parent class EmailPreferenceFragment
...
Change-Id: Ia384d92632100c2adfb22c22c03d4755250e388e
2013-08-27 14:22:17 -07:00
Tony Mantler
a2255eb1d9
am 801bb024
: Merge "Bandaid fix for overlapping buttons in incoming/outgoing settings" into jb-ub-mail-ur10
...
* commit '801bb02408e92dad27b307d36e9328186c980c7d':
Bandaid fix for overlapping buttons in incoming/outgoing settings
2013-08-27 10:39:21 -07:00
Tony Mantler
801bb02408
Merge "Bandaid fix for overlapping buttons in incoming/outgoing settings" into jb-ub-mail-ur10
2013-08-27 17:37:36 +00:00
Baligh Uddin
f3cd0deb1e
Import translations. DO NOT MERGE
...
Change-Id: I55ac03c2b04a1f2eea19318b8aeff3433723cd37
Auto-generated-cl: translation import
2013-08-26 15:07:01 -07:00
Baligh Uddin
9bf0e1f849
Import translations. DO NOT MERGE
...
Change-Id: I4b9c264053cc85bb1d955d2e0d51245e1927a170
Auto-generated-cl: translation import
2013-08-26 15:05:47 -07:00
Scott Kennedy
6f5e6b5c9a
am 0a710bde
: Fix notification preference migration
...
* commit '0a710bde6817354211525b0f3176a1e294d1cd79':
Fix notification preference migration
2013-08-26 14:45:12 -07:00
Scott Kennedy
0a710bde68
Fix notification preference migration
...
These settings need to be migrated from the database, not the
SharedPreferences file that likely shouldn't even exist.
Everything added to Account.java was removed in
Ie6ec389b5b5d2e7ab1b299d0877811ae716526e2
when it was believed to be unnecessary.
Bug: 10211615
Change-Id: If6193758febda8a3272d82792492503549a44e32
2013-08-26 14:19:54 -07:00
Tony Mantler
8d3b493d1b
Bandaid fix for overlapping buttons in incoming/outgoing settings
...
Just fall back to the phone layout for the buttons until I address b/8134410 more directly by making the incoming/outgoing screens into dialogs
Change-Id: I7ef5fb5477a2a6b723d46f111b23884519ac36ff
2013-08-26 13:44:34 -07:00
Tony Mantler
1153cb524f
am 076ab830
: Minor warnings tidy
...
* commit '076ab8307439f31e8197579f11b9bc3342fd5626':
Minor warnings tidy
2013-08-26 10:51:26 -07:00
Tony Mantler
076ab83074
Minor warnings tidy
...
Change-Id: Ib2a85ca838ae521377855b916c57bb7bd00c42f3
2013-08-26 10:17:14 -07:00
Yu Ping Hu
9f4e0ca2f6
am 9950981e
: Increment Email version.
...
* commit '9950981ec689091f7f38941283ededdbea2983b8':
Increment Email version.
2013-08-23 18:37:57 -07:00
Yu Ping Hu
9950981ec6
Increment Email version.
...
Change-Id: Ifb89a09b3bfaf9296ce8c4cd65053719ad957e5b
2013-08-23 18:01:38 -07:00
Yu Ping Hu
073505c8d5
am 9e8a6f86
: Increase char limit for a string.
...
* commit '9e8a6f86ba71d96d085af84fea05f04533de226e':
Increase char limit for a string.
2013-08-23 16:44:12 -07:00
Yu Ping Hu
9e8a6f86ba
Increase char limit for a string.
...
Bug: 10460863
Change-Id: Iaaaf2988f86cf1182a29ec6b99e88d4bbe9c309c
2013-08-23 16:38:16 -07:00
Yu Ping Hu
53e38fd3f4
am c76d008c
: Merge "Add the moved messages query." into jb-ub-mail-ur10
...
* commit 'c76d008c90dee88c53b182db9d95f6a18999b5cd':
Add the moved messages query.
2013-08-23 15:55:20 -07:00
Yu Ping Hu
c76d008c90
Merge "Add the moved messages query." into jb-ub-mail-ur10
2013-08-23 22:54:14 +00:00
Yu Ping Hu
336e65b6e1
Add the moved messages query.
...
Change-Id: I6dea8055c5d1a4195b9613f684fbd1f5e8d807fd
2013-08-23 15:50:10 -07:00
Tony Mantler
69442daf32
am ed4accb2
: Clean up warnings, finals, dead and useless code
...
* commit 'ed4accb24facd1324948abc61b0791eb3dc97cc4':
Clean up warnings, finals, dead and useless code
2013-08-23 15:20:08 -07:00
Tony Mantler
ed4accb24f
Clean up warnings, finals, dead and useless code
...
Change-Id: I8225a78c3b1712479bb5752161e3585a2bc2be2e
2013-08-23 14:43:31 -07:00
Tony Mantler
14e4ee0be3
am 21b95c10
: Check for null cursor in EmailPreferenceMigrator#migrate()
...
* commit '21b95c1071b15a8c264c945a809d60ee284020de':
Check for null cursor in EmailPreferenceMigrator#migrate()
2013-08-23 11:46:35 -07:00
Tony Mantler
21b95c1071
Check for null cursor in EmailPreferenceMigrator#migrate()
...
b/10456199
Change-Id: I3586fbb1aadbcc7e93208aa35ce948b133737d11
2013-08-23 11:43:49 -07:00
Scott Kennedy
2d52755be9
am 3b219ce0
: Merge "Add a CleanSpec" into jb-ub-mail-ur10
...
* commit '3b219ce0bc65a9892a45ffb1e311ed5638ffd143':
Add a CleanSpec
2013-08-23 11:04:09 -07:00
Tony Mantler
61c92f45e1
am c38a8427
: Merge "Add TODO for debug variable for entering debug screen" into jb-ub-mail-ur10
...
* commit 'c38a84279ba579a8a8fc618c9d2a77139d5ced4c':
Add TODO for debug variable for entering debug screen
2013-08-23 11:04:08 -07:00
Scott Kennedy
3b219ce0bc
Merge "Add a CleanSpec" into jb-ub-mail-ur10
2013-08-23 18:01:03 +00:00
Tony Mantler
c38a84279b
Merge "Add TODO for debug variable for entering debug screen" into jb-ub-mail-ur10
2013-08-23 18:00:41 +00:00
Tony Mantler
4727dc2903
Add TODO for debug variable for entering debug screen
...
See b/10446166 for STOPSHIP notice to disable debug screen before shipping
Change-Id: Ic0c845b558a2b745bc5015beb3eac3864165670d
2013-08-23 10:50:52 -07:00
Scott Kennedy
cc2e8153e6
Add a CleanSpec
...
Change-Id: I4d8e2c9f702a2f364a0c0c6a953a9e283a73a3ce
2013-08-23 10:47:19 -07:00
Andrew Sapperstein
9996d679d1
am 9b75d662
: New overflow to more places
...
* commit '9b75d662da2930fff6afdd9730b6e8b0c4b15c15':
New overflow to more places
2013-08-22 17:15:27 -07:00
Andrew Sapperstein
9b75d662da
New overflow to more places
...
Change-Id: I1cfdef636fdb32968a4a7164e1e79693475d8d09
2013-08-22 16:58:05 -07:00
Tony Mantler
c15798f1b3
am 219c3b5b
: Tidy up warnings in account setup fragments
...
* commit '219c3b5b8474bc0b95a9dcab21067ff603fccb15':
Tidy up warnings in account setup fragments
2013-08-22 15:44:45 -07:00
Tony Mantler
219c3b5b84
Tidy up warnings in account setup fragments
...
Change-Id: I078df83dbc4afd10c0783a98bfbb23bced12489c
2013-08-22 15:09:42 -07:00
Baligh Uddin
f19b19378d
am e28df242
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
...
* commit 'e28df2420522643a23646921cb252de3a6188b9d':
Import translations. DO NOT MERGE
2013-08-22 11:01:08 -07:00
Baligh Uddin
5741008c51
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11
2013-08-22 17:58:11 +00:00
Baligh Uddin
e28df24205
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
2013-08-22 17:58:04 +00:00
Scott Kennedy
adddf3b918
am a21d609a
: Merge "Move Email multi-message notification icon to UnifiedEmail" into jb-ub-mail-ur10
...
* commit 'a21d609a39553da5436a477113ceb9df19a22ee3':
Move Email multi-message notification icon to UnifiedEmail
2013-08-22 09:34:19 -07:00
Scott Kennedy
a21d609a39
Merge "Move Email multi-message notification icon to UnifiedEmail" into jb-ub-mail-ur10
2013-08-22 16:29:00 +00:00
Scott Kennedy
be7c1bdb40
am e3a0ef87
: Remove a bunch of unused resources
...
* commit 'e3a0ef87be55bd4348c9b487070288e06ff239f8':
Remove a bunch of unused resources
2013-08-22 09:15:57 -07:00
Scott Kennedy
19597e8e72
Move Email multi-message notification icon to UnifiedEmail
...
Change-Id: I70f30ac71c2c9990a8178108011db88484e6d7bc
2013-08-22 00:41:20 -07:00