Merge branch 'master' into improve-file-more
Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
BIN
OpenKeychain/src/main/res/drawable-hdpi/create_key_robot.png
Normal file
|
After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 898 B |
|
Before Width: | Height: | Size: 900 B |
|
Before Width: | Height: | Size: 757 B |
|
Before Width: | Height: | Size: 1.2 KiB |
BIN
OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed.png
Normal file
|
After Width: | Height: | Size: 675 B |
BIN
OpenKeychain/src/main/res/drawable-hdpi/status_lock_error.png
Normal file
|
After Width: | Height: | Size: 748 B |
BIN
OpenKeychain/src/main/res/drawable-hdpi/status_lock_open.png
Normal file
|
After Width: | Height: | Size: 675 B |
|
After Width: | Height: | Size: 723 B |
|
After Width: | Height: | Size: 789 B |
|
After Width: | Height: | Size: 528 B |
|
After Width: | Height: | Size: 444 B |
|
After Width: | Height: | Size: 714 B |
|
After Width: | Height: | Size: 861 B |
|
After Width: | Height: | Size: 640 B |
|
After Width: | Height: | Size: 740 B |
|
After Width: | Height: | Size: 536 B |
|
After Width: | Height: | Size: 813 B |
|
After Width: | Height: | Size: 541 B |
|
After Width: | Height: | Size: 695 B |