NON-WORKING Merge branch 'development' into linked-identities
Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java OpenKeychain/src/main/res/layout/view_key_main_fragment.xml OpenKeychain/src/main/res/values/strings.xml extern/spongycastle
8
OpenKeychain/src/main/res/anim/rotate.xml
Normal file
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<rotate xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:fromDegrees="0"
|
||||
android:toDegrees="360"
|
||||
android:pivotX="50%"
|
||||
android:pivotY="50%"
|
||||
android:duration="800"
|
||||
android:interpolator="@android:anim/linear_interpolator" />
|
||||
8
OpenKeychain/src/main/res/anim/rotate_spin.xml
Normal file
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<rotate xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:fromDegrees="0"
|
||||
android:toDegrees="360"
|
||||
android:pivotX="50%"
|
||||
android:pivotY="50%"
|
||||
android:duration="400"
|
||||
android:interpolator="@android:anim/accelerate_decelerate_interpolator" />
|
||||
|
Before Width: | Height: | Size: 260 B |
|
Before Width: | Height: | Size: 467 B |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 467 B |
|
After Width: | Height: | Size: 623 B |
|
After Width: | Height: | Size: 787 B |
|
Before Width: | Height: | Size: 415 B |
|
Before Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 2.6 KiB |
|
After Width: | Height: | Size: 1.1 KiB |
BIN
OpenKeychain/src/main/res/drawable-hdpi/ic_apps_black_24dp.png
Normal file
|
After Width: | Height: | Size: 182 B |
|
After Width: | Height: | Size: 287 B |
BIN
OpenKeychain/src/main/res/drawable-hdpi/ic_check_white_24dp.png
Normal file
|
After Width: | Height: | Size: 309 B |
BIN
OpenKeychain/src/main/res/drawable-hdpi/ic_close_white_24dp.png
Normal file
|
After Width: | Height: | Size: 324 B |
BIN
OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_search_24px.png
Normal file
|
After Width: | Height: | Size: 1.0 KiB |
|
After Width: | Height: | Size: 234 B |
|
After Width: | Height: | Size: 244 B |
BIN
OpenKeychain/src/main/res/drawable-hdpi/ic_folder_white_24dp.png
Normal file
|
After Width: | Height: | Size: 224 B |
BIN
OpenKeychain/src/main/res/drawable-hdpi/ic_help_black_24dp.png
Normal file
|
After Width: | Height: | Size: 559 B |
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 6.7 KiB |
BIN
OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png
Normal file
|
After Width: | Height: | Size: 397 B |
BIN
OpenKeychain/src/main/res/drawable-hdpi/ic_lock_white_24dp.png
Normal file
|
After Width: | Height: | Size: 399 B |
|
After Width: | Height: | Size: 351 B |
BIN
OpenKeychain/src/main/res/drawable-hdpi/ic_nfc_white_24dp.png
Normal file
|
After Width: | Height: | Size: 740 B |
|
After Width: | Height: | Size: 282 B |
BIN
OpenKeychain/src/main/res/drawable-hdpi/ic_qrcode_white_24dp.png
Normal file
|
After Width: | Height: | Size: 427 B |
|
After Width: | Height: | Size: 531 B |
BIN
OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_grey_24dp.png
Normal file
|
After Width: | Height: | Size: 297 B |
BIN
OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_white_24dp.png
Normal file
|
After Width: | Height: | Size: 296 B |
BIN
OpenKeychain/src/main/res/drawable-hdpi/ic_search_white_24dp.png
Normal file
|
After Width: | Height: | Size: 504 B |
|
After Width: | Height: | Size: 561 B |
|
After Width: | Height: | Size: 381 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 402 B |
|
Before Width: | Height: | Size: 361 B |
|
Before Width: | Height: | Size: 413 B |
|
Before Width: | Height: | Size: 242 B |
|
Before Width: | Height: | Size: 423 B |
|
Before Width: | Height: | Size: 800 B |
|
Before Width: | Height: | Size: 624 B |
|
Before Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 803 B |
|
Before Width: | Height: | Size: 330 B |
|
Before Width: | Height: | Size: 422 B |
|
Before Width: | Height: | Size: 400 B |
|
Before Width: | Height: | Size: 406 B |
|
Before Width: | Height: | Size: 390 B |
|
Before Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 717 B |
|
Before Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 736 B |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 115 B |
|
Before Width: | Height: | Size: 139 B |
|
Before Width: | Height: | Size: 115 B |
|
Before Width: | Height: | Size: 115 B |
|
Before Width: | Height: | Size: 189 B |
|
Before Width: | Height: | Size: 175 B |
|
Before Width: | Height: | Size: 381 B |
|
Before Width: | Height: | Size: 149 B |
|
Before Width: | Height: | Size: 729 B |
|
Before Width: | Height: | Size: 810 B |
|
Before Width: | Height: | Size: 913 B |
|
Before Width: | Height: | Size: 954 B |
|
Before Width: | Height: | Size: 840 B |
|
Before Width: | Height: | Size: 960 B |
|
Before Width: | Height: | Size: 761 B |
|
Before Width: | Height: | Size: 832 B |
|
Before Width: | Height: | Size: 304 B |
|
Before Width: | Height: | Size: 378 B |
|
Before Width: | Height: | Size: 499 B |
|
Before Width: | Height: | Size: 359 B |
|
Before Width: | Height: | Size: 199 B |
|
Before Width: | Height: | Size: 187 B |
|
Before Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 298 B |
|
Before Width: | Height: | Size: 675 B After Width: | Height: | Size: 675 B |
|
Before Width: | Height: | Size: 748 B After Width: | Height: | Size: 748 B |
|
Before Width: | Height: | Size: 675 B After Width: | Height: | Size: 675 B |
|
Before Width: | Height: | Size: 723 B |
|
Before Width: | Height: | Size: 789 B After Width: | Height: | Size: 789 B |
|
After Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 528 B |
|
Before Width: | Height: | Size: 444 B After Width: | Height: | Size: 444 B |
|
After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 714 B |
|
Before Width: | Height: | Size: 861 B After Width: | Height: | Size: 861 B |