summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* email: custom notification lightsstable/cm-12.1-YOG3CJorge Ruesga2015-04-296-2/+132
| | | | | Change-Id: I3aaed3c682ae33da925316a5b9a586796fe71229 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
* Automatic translation importMichael Bestas2015-04-252-0/+43
| | | | Change-Id: Id354731aa653029aa9cce6f75489559f2c9bbaf7
* email: fix eas autodiscoverJorge Ruesga2015-04-215-6/+52
| | | | | Change-Id: Ifaf5f757f7f844e49f0ac635b477fcbef4926293 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
* Fix NPE in getHierarchicalFoldertobitege2015-04-211-1/+3
| | | | | | | | Fixes exceptions like this: java.lang.NullPointerException: Attempt to read from field 'java.lang.String com.android.mail.providers.Folder.name' on a null object reference at com.android.email.activity.setup.MailboxSettings$MailboxSettingsFolderLoaderCallbacks.getHierarchicalFolder(MailboxSettings.java:377) Change-Id: I2c5dda84439caa5d894f5706c9c6a07079cda69c
* email: finish the settings activity after delete its accountJorge Ruesga2015-04-201-6/+2
| | | | | Change-Id: I540f1fe9dc874093ad0067cd56c9f0920620ece1 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
* Automatic translation importMichael Bestas2015-04-178-0/+179
| | | | Change-Id: I8bf6ec74fa7132f71554e88d390cc89feb02df15
* Automatic translation importMichael Bestas2015-04-173-0/+67
| | | | Change-Id: I13324c929f272c36bc31650a508cbc1f4c874d08
* Automatic translation importMichael Bestas2015-04-1719-0/+437
| | | | Change-Id: Ifd737704c6917543e69c08bcf3800ecc309a0f4e
* Update strings for crowdinMichael Bestas2015-04-171-4/+3
| | | | Change-Id: Ib59198e1321db5b3c6889432c842d42dd040cea4
* email: support per-folder notificationsJorge Ruesga2015-04-066-55/+698
| | | | | | | This change enables support to configure per-folder notifications options. Change-Id: I6107340da3438ea223506bb22ff898cca179c1f6 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
* email: support for auto-sync multiple IMAP foldersJorge Ruesga2015-04-057-51/+111
| | | | | | | | | This enables to auto-sync multiple IMAP folders, not only Inbox. Default to Inbox only. This changes relays in the syncloopback attribute to configure the folders to add to sync process. Change-Id: I8973cfd6ddec33446256bc8b48418558e27596b5 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
* email: add an option for delete the accountJorge Ruesga2015-04-044-5/+165
| | | | | Change-Id: I0f0f2b7ea950d5154f90cd60261c6918b7ad36b7 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
* email: don't block extras databaseJorge Ruesga2015-04-041-12/+6
| | | | | | | | This will call other setences (like delete accoutns) to block access. Just integrate in the normal database transactions Change-Id: I48d7028f2ceddcdfbc170acd1a1fe32f0322b6e6 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
* Merge tag 'android-5.1.0_r1' into merge-5.1staging/cm-12.1Tom Marshall2015-03-12270-5989/+2198
|\ | | | | | | | | | | | | | | | | | | Android 5.1.0 release 1 Conflicts: provider_src/com/android/email/provider/AccountReconciler.java provider_src/com/android/email/provider/EmailProvider.java Change-Id: I5b67dce2cbafd7899202c461c607a4fc412d8e62
| * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-080-0/+0
| |\ | | | | | | | | | 813e1bfec1fc03a9d87b4cc0fa2d6931f3485eec
| | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-060-0/+0
| |/| | | | | | | | | | 813e1bfec1fc03a9d87b4cc0fa2d6931f3485eec
| | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-050-0/+0
| |/| | | | | | | | | | 813e1bfec1fc03a9d87b4cc0fa2d6931f3485eec
| | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-040-0/+0
| |/| | | | | | | | | | 813e1bfec1fc03a9d87b4cc0fa2d6931f3485eec
| | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-030-0/+0
| | |\ | | | | | | | | | | | | 19c35f5f574a1ccf1447c17d55cb1828d09ab140
| | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-020-0/+0
| | | |\ | | | | | | | | | | | | | | | 3b78a3105969eae98ecc34cbb7eef7f6b6c858e3
| | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-010-0/+0
| | | |/| | | | | | | | | | | | | | | | 3b78a3105969eae98ecc34cbb7eef7f6b6c858e3
| | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-300-0/+0
| | | |/| | | | | | | | | | | | | | | | 3b78a3105969eae98ecc34cbb7eef7f6b6c858e3
| | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-290-0/+0
| | | |/| | | | | | | | | | | | | | | | 3b78a3105969eae98ecc34cbb7eef7f6b6c858e3
| | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-280-0/+0
| | | |/| | | | | | | | | | | | | | | | 3b78a3105969eae98ecc34cbb7eef7f6b6c858e3
| | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-270-0/+0
| | | |/| | | | | | | | | | | | | | | | 3b78a3105969eae98ecc34cbb7eef7f6b6c858e3
| | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-260-0/+0
| | | |/| | | | | | | | | | | | | | | | 3b78a3105969eae98ecc34cbb7eef7f6b6c858e3
| | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-250-0/+0
| | | |/| | | | | | | | | | | | | | | | 3b78a3105969eae98ecc34cbb7eef7f6b6c858e3
| | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-230-0/+0
| | | |/| | | | | | | | | | | | | | | | 3b78a3105969eae98ecc34cbb7eef7f6b6c858e3
| | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-220-0/+0
| | | |/| | | | | | | | | | | | | | | | 3b78a3105969eae98ecc34cbb7eef7f6b6c858e3
| | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-210-0/+0
| | | |/| | | | | | | | | | | | | | | | 3b78a3105969eae98ecc34cbb7eef7f6b6c858e3
| | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-200-0/+0
| | | |/| | | | | | | | | | | | | | | | 3b78a3105969eae98ecc34cbb7eef7f6b6c858e3
| | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-190-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | b83335b70a565caaeef39a8b98fc1df476fadce2
| | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-180-0/+0
| | | | |/| | | | | | | | | | | | | | | | | | | b83335b70a565caaeef39a8b98fc1df476fadce2
| | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-160-0/+0
| | | | |/| | | | | | | | | | | | | | | | | | | b83335b70a565caaeef39a8b98fc1df476fadce2
| | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-150-0/+0
| | | | |/| | | | | | | | | | | | | | | | | | | b83335b70a565caaeef39a8b98fc1df476fadce2
| | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-140-0/+0
| | | | |/| | | | | | | | | | | | | | | | | | | b83335b70a565caaeef39a8b98fc1df476fadce2
| | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-130-0/+0
| | | | |/| | | | | | | | | | | | | | | | | | | b83335b70a565caaeef39a8b98fc1df476fadce2
| | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-120-0/+0
| | | | |/| | | | | | | | | | | | | | | | | | | b83335b70a565caaeef39a8b98fc1df476fadce2
| | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-110-0/+0
| | | | |/| | | | | | | | | | | | | | | | | | | b83335b70a565caaeef39a8b98fc1df476fadce2
| | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-090-0/+0
| | | | |/| | | | | | | | | | | | | | | | | | | b83335b70a565caaeef39a8b98fc1df476fadce2
| | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-080-0/+0
| | | | |/| | | | | | | | | | | | | | | | | | | b83335b70a565caaeef39a8b98fc1df476fadce2
| | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-070-0/+0
| | | | |/| | | | | | | | | | | | | | | | | | | b83335b70a565caaeef39a8b98fc1df476fadce2
| | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-060-0/+0
| | | | |/| | | | | | | | | | | | | | | | | | | b83335b70a565caaeef39a8b98fc1df476fadce2
| | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-050-0/+0
| | | | |/| | | | | | | | | | | | | | | | | | | b83335b70a565caaeef39a8b98fc1df476fadce2
| | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-040-0/+0
| | | | |/| | | | | | | | | | | | | | | | | | | b83335b70a565caaeef39a8b98fc1df476fadce2
| | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-020-0/+0
| | | | |/| | | | | | | | | | | | | | | | | | | b83335b70a565caaeef39a8b98fc1df476fadce2
| | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-010-0/+0
| | | | |/| | | | | | | | | | | | | | | | | | | b83335b70a565caaeef39a8b98fc1df476fadce2
| | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-09-300-0/+0
| | | | |/| | | | | | | | | | | | | | | | | | | b83335b70a565caaeef39a8b98fc1df476fadce2
| | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-09-290-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | 845b3b143c8a0a0758baad2cd0431fda78c7f92a
| | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-09-280-0/+0
| | | | | |/| | | | | | | | | | | | | | | | | | | | | | 845b3b143c8a0a0758baad2cd0431fda78c7f92a