Commit Graph

13408 Commits

Author SHA1 Message Date
Paul Westbrook
3dfa01bc36 am a27640e0: am 4764cb8d: Fix unit test
* commit 'a27640e01d80c2aefb85e399531d6313ff19bbcc':
  Fix unit test
2014-08-20 21:27:27 +00:00
Andrew Sapperstein
80ae596bef am 173dc408: am 36fd3893: Use ShortcutWidgetTheme.
* commit '173dc4086f403d4a3d87aa3ef61dc308f77f303f':
  Use ShortcutWidgetTheme.
2014-08-20 21:27:26 +00:00
Andrew Sapperstein
8c23dea6e1 am a43520ba: am 05a96bdc: switch to appcompat. b/16664350
* commit 'a43520ba56f23cdb399a83d70e29bcc224622600':
  switch to appcompat. b/16664350
2014-08-20 21:27:25 +00:00
Jin Cao
28e120256e am ddacf491: am 65848dc5: Merge "Support the new MOVE_FAILED_TO_DRAFT operation in Email" into ub-gmail-ur14-dev
* commit 'ddacf491c3b9d9a9d1af9e463a716db2a37bf648':
  Support the new MOVE_FAILED_TO_DRAFT operation in Email
2014-08-20 21:27:24 +00:00
Geoff Mendal
82f6f31e19 am 033d40ed: (-s ours) Import translations. DO NOT MERGE
* commit '033d40ed379f9e353dd30569f969780e16cc51fa':
  Import translations. DO NOT MERGE
2014-08-20 21:27:23 +00:00
Paul Westbrook
9caf770d50 am a1f282a6: am 0ef2851a: Add proguard rules for small unit test
* commit 'a1f282a665b756e7de8f05d414b64da6e506a49c':
  Add proguard rules for small unit test
2014-08-20 21:27:22 +00:00
Paul Westbrook
533687b1a0 am 36ad0d43: am d37ca267: Clean up proguard test flags file
* commit '36ad0d430c87a75f8c9293afaa141f2b590c42bd':
  Clean up proguard test flags file
2014-08-20 21:27:21 +00:00
Paul Westbrook
af669b9454 am 3f16bf9a: am bc65885e: Merge "Use test proguard config for eng builds" into ub-gmail-ur14-dev
* commit '3f16bf9a371fa183694c11bb3de9b482ed28be24':
  Use test proguard config for eng builds
2014-08-20 21:27:21 +00:00
Andrew Sapperstein
c35299e282 am cabfc827: am 0a17fcfa: temp fix for b/16730607
* commit 'cabfc827915f44bf0b1957a479ec9636df95b393':
  temp fix for b/16730607
2014-08-20 21:27:20 +00:00
Anthony Lee
afe29c1b8d am 54dc0fdb: am 347c5117: Update version for L
* commit '54dc0fdb7b0c83f246cec11ff6c21f1b6d3c33c5':
  Update version for L
2014-08-20 21:27:19 +00:00
Tony Mantler
0a4c3dc76b am 072da2b0: am 751da261: Add Exchange fallback and support diverting to Gmail
* commit '072da2b0331bab7d6195db3bb563756ddcf7c47c':
  Add Exchange fallback and support diverting to Gmail
2014-08-20 21:27:18 +00:00
Tony Mantler
fa94c99182 am 59c259d6: am 16176e5b: Imap folders are case sensitive
* commit '59c259d66f0ad751752b4f01c38aa05417e9640a':
  Imap folders are case sensitive
2014-08-20 21:27:17 +00:00
Anthony Lee
2817eb6cb7 am 7a5f8d6c: Merge "Update version for L" into ub-mail-master
* commit '7a5f8d6c474631cfbe16c7d05365addfa03550b8':
  Update version for L
2014-08-20 21:27:16 +00:00
Tony Mantler
81efad6a90 am 742f94b3: Merge "Imap folders are case sensitive" into ub-mail-master
* commit '742f94b3c07eadbc8e8cda2dcf20693971a37f71':
  Imap folders are case sensitive
2014-08-20 21:27:15 +00:00
Tony Mantler
12bcbdb483 am d039322f: Add Exchange fallback and support diverting to Gmail
* commit 'd039322f7402ef402eb66c92b899510dd6649e2d':
  Add Exchange fallback and support diverting to Gmail
2014-08-20 21:27:14 +00:00
Tony Mantler
1ebae38a16 am e495f17a: Merge "Add support for disabling OAuth on setup flow only" into ub-mail-master
* commit 'e495f17a4f22b047013b0011d261b42520c36013':
  Add support for disabling OAuth on setup flow only
2014-08-20 21:27:13 +00:00
Jay Shrauner
e7f57fdad5 am 11f15608: Disable backup
* commit '11f15608d62e9ac95ff4dbd8dcedec34ba4fe974':
  Disable backup
2014-08-20 21:27:12 +00:00
Geoff Mendal
fa147c6ace am 7063124d: (-s ours) Import translations. DO NOT MERGE
* commit '7063124d1dcf27292546500e873abe1d574e5a4b':
  Import translations. DO NOT MERGE
2014-08-20 21:27:11 +00:00
Tony Mantler
3d12b2ccc5 am 751a029c: Convert server settings to dialog
* commit '751a029c315e642e5ea979f38927ede34d82edfa':
  Convert server settings to dialog
2014-08-20 21:27:10 +00:00
Tony Mantler
a653ccf446 am 6e976f1d: Update Email with Material icon
* commit '6e976f1d05c1896070efc9df57267e37d8ae2152':
  Update Email with Material icon
2014-08-20 21:27:09 +00:00
Anthony Lee
1710a56c95 am ebe49cfe: b/16570506. Only enable alternate EAS authenticator when needed.
* commit 'ebe49cfeaf0328aa95f5cb82b731f08d7bae7b09':
  b/16570506. Only enable alternate EAS authenticator when needed.
2014-08-20 21:27:08 +00:00
Martin Hibdon
22302fbaac am aaa26e8c: Merge "Disable Eas Authenticator if Exchange is not installed" into ub-mail-master
* commit 'aaa26e8c3f5c8b56e0a8b5b21916a188c051f737':
  Disable Eas Authenticator if Exchange is not installed
2014-08-20 21:27:07 +00:00
Martin Hibdon
24eca87653 am 29180e6b: Merge "Update version" into ub-mail-master
* commit '29180e6b36c5cebf3ac25d4a31877387bc43e44a':
  Update version
2014-08-20 21:26:56 +00:00
Anthony Lee
ce2d44ddc0 am 20110e62: Factor out the guts of setupAccountManagerAccount()
* commit '20110e628830a906f4c6a80eabb0bb127bf7d4be':
  Factor out the guts of setupAccountManagerAccount()
2014-08-20 21:26:55 +00:00
Andrew Sapperstein
5a94c49c2f am a0389a26: Remove unused string.
* commit 'a0389a26b88705c375b0e144d1810ef46e1d0d8f':
  Remove unused string.
2014-08-20 21:26:53 +00:00
Qiwen Zhao
c0977c8580 reset to ub-mail-master-release at 1235730 2014-08-20 14:15:13 -07:00
The Android Automerger
1235730a47 merge in ub-mail-master-release history after reset to fc67cb019c 2014-08-19 13:50:27 -07:00
Paul Westbrook
fc67cb019c am 1371dd99: Change method signature
* commit '1371dd990ff08186d6754a8ca24b87b4c11dd746':
  Change method signature
2014-08-19 16:51:26 +00:00
Paul Westbrook
1371dd990f Change method signature
Bug: 16153528
Change-Id: I7f183bab825176814275f6c99981554e4529983a
2014-08-19 03:28:43 -07:00
Tony Mantler
3f32ffd759 am f4b55c8e: Merge "Fix folder sync settings for tablet" into ub-gmail-ur14-dev
* commit 'f4b55c8edb059d0704fad76b85b7a3f7a36dfec2':
  Fix folder sync settings for tablet
2014-08-18 16:51:48 +00:00
Baligh Uddin
7f60bfbf63 am 3ff7d576: (-s ours) am 421b73b4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '3ff7d5769809546ed2a7bedb5080d1ffbbf5f555':
  Import translations. DO NOT MERGE
2014-08-17 14:17:58 +00:00
Baligh Uddin
3ff7d57698 am 421b73b4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '421b73b4fdacb10c47cce9fc9321fcf4c6923802':
  Import translations. DO NOT MERGE
2014-08-17 13:58:47 +00:00
Baligh Uddin
1999b6b7be am abdf5018: (-s ours) am 8706ea6a: (-s ours) am d9a3ebd6: (-s ours) am 307cf10c: (-s ours) Import translations. DO NOT MERGE
* commit 'abdf5018d254325f66ba57a02ad1e22110cf9885':
  Import translations. DO NOT MERGE
2014-08-16 04:36:57 +00:00
Baligh Uddin
abdf5018d2 am 8706ea6a: (-s ours) am d9a3ebd6: (-s ours) am 307cf10c: (-s ours) Import translations. DO NOT MERGE
* commit '8706ea6ab1711c9c1fd014a89fb5c25039174017':
  Import translations. DO NOT MERGE
2014-08-16 04:20:13 +00:00
Baligh Uddin
8706ea6ab1 am d9a3ebd6: (-s ours) am 307cf10c: (-s ours) Import translations. DO NOT MERGE
* commit 'd9a3ebd6c62221ae0e3dafd34a3e1c65d6df7208':
  Import translations. DO NOT MERGE
2014-08-16 04:00:52 +00:00
Baligh Uddin
421b73b4fd Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 03:56:00 +00:00
Tony Mantler
f4b55c8edb Merge "Fix folder sync settings for tablet" into ub-gmail-ur14-dev 2014-08-16 03:56:00 +00:00
Baligh Uddin
ccc705116a Import translations. DO NOT MERGE
Change-Id: I9d081741671b2f03401bdde8bf9dfe7b00086eb3
Auto-generated-cl: translation import
2014-08-15 19:50:19 -07:00
Rohan Shah
14e1d8ac96 am 3984736f: Merge "Fix FolderSelectionActivity Issue (Widget)" into ub-gmail-ur14-dev
* commit '3984736fb2e46629950e9666f7078862da455cf1':
  Fix FolderSelectionActivity Issue (Widget)
2014-08-16 01:12:22 +00:00
Rohan Shah
3fd0cbaa91 am a8a185f7: Merge "Update Notifications Icon (Email)" into ub-gmail-ur14-dev
* commit 'a8a185f75c1173278d5930a07687a7a3d6bdfe1b':
  Update Notifications Icon (Email)
2014-08-16 01:12:21 +00:00
Tony Mantler
ac4b0efd9f Fix folder sync settings for tablet
b/17068128

Change-Id: Ia61cba10fb0edc97448d9ff39aa58578db1d4ac7
2014-08-15 16:24:38 -07:00
Tony Mantler
2d109f4f93 am 486e9710: Fix providers.xml alternate diversion
* commit '486e971066979f41c1a38ad7414cd1430a55d87e':
  Fix providers.xml alternate diversion
2014-08-15 22:59:26 +00:00
Baligh Uddin
d9a3ebd6c6 am 307cf10c: (-s ours) Import translations. DO NOT MERGE
* commit '307cf10c2a64757bc91f375166f31728d417b508':
  Import translations. DO NOT MERGE
2014-08-15 22:20:20 +00:00
Baligh Uddin
307cf10c2a Import translations. DO NOT MERGE
Change-Id: I9d6ea0a8130f01da4face9fe1a5a64a96ae4b08d
Auto-generated-cl: translation import
2014-08-15 12:29:49 -07:00
Tony Mantler
486e971066 Fix providers.xml alternate diversion
b/17048013

Change-Id: If2bc857266a6ba1445bf1fabbaed179c1b13a14f
2014-08-15 11:54:56 -07:00
Rohan Shah
3984736fb2 Merge "Fix FolderSelectionActivity Issue (Widget)" into ub-gmail-ur14-dev 2014-08-15 18:45:09 +00:00
Rohan Shah
2537c352e4 Fix FolderSelectionActivity Issue (Widget)
Part of the AppCompat audit

Bug: 16987963
Change-Id: I1dc21f53e7f3dbb9cc9ad6dcacf177cfc8ad7658
2014-08-15 17:19:44 -07:00
Rohan Shah
a8a185f75c Merge "Update Notifications Icon (Email)" into ub-gmail-ur14-dev 2014-08-15 18:45:09 +00:00
Rohan Shah
b5e710f447 Update Notifications Icon (Email)
Rest in pieces little gmail icon :(

Change-Id: I14459cba33cf61f6717d922bdb006d8d56ad893c
2014-08-15 17:54:08 -07:00
Baligh Uddin
b9287b8a78 am 6d165bca: (-s ours) Import translations. DO NOT MERGE
* commit '6d165bca6b835f289d78322a415bc48a48e2dd57':
  Import translations. DO NOT MERGE
2014-08-15 06:03:43 +00:00