New answers tagged encryption
First, both encryptions you name are the same – only that Lollipop enforces this automatically on some devices. Second: it's not the files being encrypted, but the entire partitions – thus everything saved to it ends up in (using simple terms) an "encrypted container". Everything transparent, so you won't notice. No need to re-encrypt.
As of 04-01-2015 custom recoveries don't support decryption CM12 yet. It will give you a wrong password notification when trying to decrypt. But you can put the update .zip in /cache. Then in the recovery skip entering the password. And flash from /cache. This works because to access /cache you don't need your password.
You already indicated the possible use of an app. And indeed, next to the so-called "vault apps", there are several options for Encryption of Files and Folders which work transparently on the file system. For some, you still will need to use "specific folders" which you encrypt, though – while most of the others fall into the category of requiring root ...
Apparently on the "Accounts" screen, one has to long press the account. Menu will pop up. Click on "Account settings". Another menu will pop up. Click on the "Cryptography" item at the bottom. The Cryptography menu will open. Click on "OpenPGP Provider". By default, "None" is selected. Click on the "OpenKeychain" and you're set! Hope this helps!
Top 50 recent answers are included