Commit Graph

13408 Commits

Author SHA1 Message Date
Baligh Uddin
6d165bca6b Import translations. DO NOT MERGE
Change-Id: Ice21d328d3d7e6364ec40a6d3b84b8b03ae6b81b
Auto-generated-cl: translation import
2014-08-14 22:19:23 -07:00
Baligh Uddin
568de310b6 am ea99a057: (-s ours) Import translations. DO NOT MERGE
* commit 'ea99a057330a118ac1f4371aac0f603401eb30cf':
  Import translations. DO NOT MERGE
2014-08-15 03:42:22 +00:00
Baligh Uddin
ea99a05733 Import translations. DO NOT MERGE
Change-Id: I8449b7fd0a2636b78453332a99452ac688daf15b
Auto-generated-cl: translation import
2014-08-14 20:28:06 -07:00
James Lemieux
fcc6020924 am 66ff95a5: Merge "End of Life screen for Email" into ub-gmail-ur14-dev
* commit '66ff95a5613aed24fb0213bc559b4fd17c2eb1a4':
  End of Life screen for Email
2014-08-14 21:04:54 +00:00
Rohan Shah
c453deeefc am 7941b406: Update Notifications (Email)
* commit '7941b406cf8e84fa672a4f28181b9b3dbd396079':
  Update Notifications (Email)
2014-08-14 00:39:27 +00:00
Rohan Shah
7941b406cf Update Notifications (Email)
Switched out icons (For updated mail notify icon).

Bug: 16987147
Change-Id: I695b4c51daddc47eecbe7d856de642932190c4bb
2014-08-13 17:24:52 -07:00
Tony Mantler
df1a68ebd0 am 43106e9d: Merge "Extend MailboxSettings to handle full folder list" into ub-gmail-ur14-dev
* commit '43106e9de3548603094107bec965b941c4e93c21':
  Extend MailboxSettings to handle full folder list
2014-08-13 22:13:40 +00:00
Martin Hibdon
cd267c4744 am 80982db3: Update email version number
* commit '80982db38b18ed85c1cd48c2cd1a76bc1d0ebcd9':
  Update email version number
2014-08-13 18:35:22 +00:00
Martin Hibdon
80982db38b Update email version number
Change-Id: I1a86266060cf39461ac1ab77a2383885d6d7a75d
(cherry picked from commit 2fc57a8bac)
2014-08-13 18:29:18 +00:00
Tony Mantler
43106e9de3 Merge "Extend MailboxSettings to handle full folder list" into ub-gmail-ur14-dev 2014-08-12 23:14:35 +00:00
Tony Mantler
9f14d6b0de Extend MailboxSettings to handle full folder list
b/16541463

Change-Id: If428413ad258497a5654fa095d51cd60f6ed4e18
2014-08-13 14:18:01 -07:00
James Lemieux
66ff95a561 Merge "End of Life screen for Email" into ub-gmail-ur14-dev 2014-08-12 23:14:33 +00:00
James Lemieux
50591a7be4 End of Life screen for Email
b/16843301

This introduces a new build target: EmailGoogleTombstone.
Building with a tapas line that includes that target will
produce EmailGoogleTombstone.apk. The apk includes the
EmailProvider and AttachmentProvider (for migration to
Gmail) and an activity that explains to the user where to
find their email data.

Change-Id: Ib8192b46d9017e04f5c99f5c8e509531198eec07
2014-08-14 11:31:33 -07:00
Tony Mantler
5a8065ef11 am ca02ab31: Don\'t export MailboxSettings
* commit 'ca02ab3161171c347aa01e703267446c76f22aa7':
  Don't export MailboxSettings
2014-08-12 23:08:51 +00:00
Tony Mantler
ca02ab3161 Don't export MailboxSettings
b/16541463

Change-Id: I5cebc3c679c8cd80d1344edb21b253c3a4a12d6c
2014-08-12 15:42:57 -07:00
Baligh Uddin
3b60e1ec3c am 48d6f0de: (-s ours) am e32ac326: (-s ours) Import translations. DO NOT MERGE
* commit '48d6f0de4f13c5a93e5f820e9d3ac8ff4e18a247':
  Import translations. DO NOT MERGE
2014-08-12 16:54:41 +00:00
Baligh Uddin
48d6f0de4f am e32ac326: (-s ours) Import translations. DO NOT MERGE
* commit 'e32ac326f40fe44472324313b09627ac225893b9':
  Import translations. DO NOT MERGE
2014-08-12 16:49:16 +00:00
Baligh Uddin
e29403d7c8 am a780beb0: (-s ours) Import translations. DO NOT MERGE
* commit 'a780beb0f8e5d42c0e30b44ce2dac1bfc689175b':
  Import translations. DO NOT MERGE
2014-08-12 16:48:23 +00:00
Martin Hibdon
2fc57a8bac Update email version number
Change-Id: I1a86266060cf39461ac1ab77a2383885d6d7a75d
2014-08-11 16:12:39 -07:00
Baligh Uddin
a780beb0f8 Import translations. DO NOT MERGE
Change-Id: I860f4cdce83a78886cf33358d31118f5dafa9c89
Auto-generated-cl: translation import
2014-08-11 11:27:53 -07:00
Baligh Uddin
e32ac326f4 Import translations. DO NOT MERGE
Change-Id: I8c200774872f7ebb5a8a80f3c540726fc5bca5e2
Auto-generated-cl: translation import
2014-08-11 11:24:09 -07:00
Baligh Uddin
7ae1a977d3 Merge "Import translations. DO NOT MERGE" into ub-mail-master 2014-08-11 18:20:32 +00:00
Baligh Uddin
80d5ccf843 Import translations. DO NOT MERGE
Change-Id: I0dadaaca3b0ca71f87008c9e161605fb6fd26305
Auto-generated-cl: translation import
2014-08-11 11:28:35 -07:00
Tony Mantler
2cdb08d494 am ea0c4007: Use margin instead of padding to work around ICS/JB bug
* commit 'ea0c40079ca7c0e6d6c36ec6080c52daa87a761e':
  Use margin instead of padding to work around ICS/JB bug
2014-08-08 21:54:40 +00:00
Tony Mantler
ea0c40079c Use margin instead of padding to work around ICS/JB bug
b/16897364

Change-Id: I777446331efcf7735a4d3de9eeedd7fa57dc8d36
2014-08-08 14:48:18 -07:00
Baligh Uddin
1a127a9806 am 5a564d6a: (-s ours) am 3c16f24b: (-s ours) Import translations. DO NOT MERGE
* commit '5a564d6a6b118abdae3b82c1731bf2c395e36de7':
2014-08-08 16:19:07 +00:00
Baligh Uddin
8564c78e5d am 3c16f24b: (-s ours) Import translations. DO NOT MERGE
* commit '3c16f24b11e75d36e914b8fd02f0b2b852210a7c':
  Import translations. DO NOT MERGE
2014-08-08 16:16:33 +00:00
Baligh Uddin
5a564d6a6b am 3c16f24b: (-s ours) Import translations. DO NOT MERGE
* commit '3c16f24b11e75d36e914b8fd02f0b2b852210a7c':
  Import translations. DO NOT MERGE
2014-08-08 16:16:33 +00:00
Baligh Uddin
3c16f24b11 Import translations. DO NOT MERGE
Change-Id: I670f76af96ecb6754443ddedfd0d660def797239
Auto-generated-cl: translation import
2014-08-08 08:52:29 -07:00
Tony Mantler
b3e36605ac am 0c4f45e8: Add chromium.org to providers.xml
* commit '0c4f45e854b2c98c57ae10ba7533c2a45226e819':
  Add chromium.org to providers.xml
2014-08-07 23:14:48 +00:00
Tony Mantler
428ebd7260 am 4c865846: Don\'t return a protocol for a null account type
* commit '4c865846856cd7530fb51e244a9971a3d5e1fcd8':
  Don't return a protocol for a null account type
2014-08-07 22:55:27 +00:00
Tony Mantler
0c4f45e854 Add chromium.org to providers.xml
Change-Id: Iea88c59bcd883e7d06b3e55dcd3edb74e3c5a324
2014-08-07 15:51:38 -07:00
Tony Mantler
4c86584685 Don't return a protocol for a null account type
b/16735532

Change-Id: Ie83709fe3a9942ef946cf86f853b3d6565dc5799
2014-08-07 15:36:20 -07:00
Tony Mantler
67f497c634 am f1789afa: Switch null checks to TextUtils.isEmpty()
* commit 'f1789afa535b113047ef20623d79fdfb257537aa':
  Switch null checks to TextUtils.isEmpty()
2014-08-07 21:16:33 +00:00
Tony Mantler
f1789afa53 Switch null checks to TextUtils.isEmpty()
b/16872654

Change-Id: Ib8943f068ad6988ff08f8bfd54e2df8fa5ce0274
2014-08-07 14:11:02 -07:00
Anthony Lee
96f8d2accd am 8218d006: Merge "Make sure that we close the cursor." into ub-gmail-ur14-dev
* commit '8218d00634356ec11e274380007f1b2574cb5547':
  Make sure that we close the cursor.
2014-08-07 20:37:01 +00:00
Tony Mantler
b63e70f179 Skip null/empty account types
b/16730607

Change-Id: I6b3207edbf3dc841dd2222e92f69d270a0caf773
(cherry picked from commit 1381d4083b)
2014-08-07 20:28:41 +00:00
Tony Mantler
f0deafc816 am 1381d408: Skip null/empty account types
* commit '1381d4083bbfdf046eceac081420ab3fa7a1ae81':
  Skip null/empty account types
2014-08-07 20:24:49 +00:00
Tony Mantler
1381d4083b Skip null/empty account types
b/16730607

Change-Id: I6b3207edbf3dc841dd2222e92f69d270a0caf773
2014-08-07 12:58:18 -07:00
Anthony Lee
8218d00634 Merge "Make sure that we close the cursor." into ub-gmail-ur14-dev 2014-08-07 15:00:45 +00:00
Anthony Lee
4524dccde8 Make sure that we close the cursor.
Found this problem while testing Email migration.

Change-Id: I07862b5c4dd2ef189a87f7dbd085030c448f365f
2014-08-07 13:13:21 -07:00
Régis Décamps
191937b69d am 34aae3cb: Merge "Fix getAllAmAccounts() returning duplicated accounts" into ub-gmail-ur14-dev
* commit '34aae3cbc41deadd927b5d6cdbff33bfd0c22758':
  Fix `getAllAmAccounts()` returning duplicated accounts
2014-08-07 08:53:14 +00:00
The Android Automerger
a1d60ff48a merge in ub-mail-master-release history after reset to 222e8255b1 2014-08-06 16:24:27 -07:00
Paul Westbrook
222e8255b1 am e76b7bbf: Fix proguard rule
* commit 'e76b7bbf78d9fe58e48773c18b88a597610750f2':
  Fix proguard rule
2014-08-06 20:42:31 +00:00
Paul Westbrook
e76b7bbf78 Fix proguard rule
-keepclasseswithmembers is strict.  If it isn't able to find any of the
methods listed, the whole class can be stripped

Bug: 16825652
Change-Id: I1e8eefba9e0cf4b596f7e8041161e12bde6b51c6
2014-08-06 00:41:47 -07:00
Paul Westbrook
a27640e01d am 4764cb8d: Fix unit test
* commit '4764cb8d4843a9d4ce5cf5b259ae6be7d3c5fa9c':
  Fix unit test
2014-08-06 02:08:53 +00:00
Paul Westbrook
4764cb8d48 Fix unit test
Bug: 16825652
Change-Id: I1c139afb0f3aa50dca742ed48c92a16f9078ea59
2014-08-05 18:24:51 -07:00
Andrew Sapperstein
173dc4086f am 36fd3893: Use ShortcutWidgetTheme.
* commit '36fd3893815d9d07f880b5235eee98b169fd83ae':
  Use ShortcutWidgetTheme.
2014-08-05 22:56:02 +00:00
Andrew Sapperstein
a43520ba56 am 05a96bdc: switch to appcompat. b/16664350
* commit '05a96bdccdd04b9255e7b2c06ed286ed3c646471':
  switch to appcompat. b/16664350
2014-08-05 22:56:01 +00:00
The Android Automerger
76213185ad merge in ub-mail-master-release history after reset to ddacf491c3 2014-08-05 13:28:21 -07:00