diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-08-29 13:28:56 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-08-29 13:28:56 +0200 |
commit | a6e25e6448ab162b351288ee0c241512e05c3611 (patch) | |
tree | d7eec4fcd2d98bc9d00e880ab3c103c86a8edbe2 /OpenKeychain/src/main/res/anim | |
parent | 765ec094c9415fcaddd65b7b743179b2ea7dc098 (diff) | |
parent | 5b75b542e8d2d467ce9e34bd9df2038d6c88885e (diff) | |
download | open-keychain-a6e25e6448ab162b351288ee0c241512e05c3611.tar.gz open-keychain-a6e25e6448ab162b351288ee0c241512e05c3611.tar.bz2 open-keychain-a6e25e6448ab162b351288ee0c241512e05c3611.zip |
Merge branch 'linked-identities' (and fix OperationHelper ids)
Merge Linked Identities.
Also includes an important fix for OperationHelper ids, which had an
error in the bit mask logic.
Conflicts:
Graphics/update-drawables.sh
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.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/CertifyActionsParcel.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
OpenKeychain/src/main/res/anim/fade_in.xml
OpenKeychain/src/main/res/anim/fade_out.xml
OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
OpenKeychain/src/main/res/layout/view_key_fragment.xml
OpenKeychain/src/main/res/menu/key_view.xml
OpenKeychain/src/main/res/values/strings.xml
OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
README.md
Diffstat (limited to 'OpenKeychain/src/main/res/anim')
-rw-r--r-- | OpenKeychain/src/main/res/anim/fade_in_down.xml | 11 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/anim/fade_in_quick.xml | 7 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/anim/fade_in_up.xml | 11 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/anim/fade_out_down.xml | 11 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/anim/fade_out_quick.xml | 7 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/anim/fade_out_up.xml | 11 |
6 files changed, 58 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/anim/fade_in_down.xml b/OpenKeychain/src/main/res/anim/fade_in_down.xml new file mode 100644 index 000000000..fb9ed416e --- /dev/null +++ b/OpenKeychain/src/main/res/anim/fade_in_down.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<set xmlns:android="http://schemas.android.com/apk/res/android"> + <translate android:fromYDelta="-10" android:toYDelta="0" + android:interpolator="@android:anim/decelerate_interpolator" + android:duration="200" + /> + <alpha android:fromAlpha="0.0" android:toAlpha="1.0" + android:interpolator="@android:anim/accelerate_interpolator" + android:duration="200" + /> +</set>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/anim/fade_in_quick.xml b/OpenKeychain/src/main/res/anim/fade_in_quick.xml new file mode 100644 index 000000000..e0725de3d --- /dev/null +++ b/OpenKeychain/src/main/res/anim/fade_in_quick.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<set xmlns:android="http://schemas.android.com/apk/res/android"> + <alpha android:fromAlpha="0.0" android:toAlpha="1.0" + android:interpolator="@android:anim/bounce_interpolator" + android:duration="400" + /> +</set>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/anim/fade_in_up.xml b/OpenKeychain/src/main/res/anim/fade_in_up.xml new file mode 100644 index 000000000..c190c0f53 --- /dev/null +++ b/OpenKeychain/src/main/res/anim/fade_in_up.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<set xmlns:android="http://schemas.android.com/apk/res/android"> + <translate android:fromYDelta="10" android:toYDelta="0" + android:interpolator="@android:anim/decelerate_interpolator" + android:duration="200" + /> + <alpha android:fromAlpha="0.0" android:toAlpha="1.0" + android:interpolator="@android:anim/accelerate_interpolator" + android:duration="200" + /> +</set>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/anim/fade_out_down.xml b/OpenKeychain/src/main/res/anim/fade_out_down.xml new file mode 100644 index 000000000..523b180af --- /dev/null +++ b/OpenKeychain/src/main/res/anim/fade_out_down.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<set xmlns:android="http://schemas.android.com/apk/res/android"> + <translate android:fromYDelta="0.0" android:toYDelta="10" + android:interpolator="@android:anim/decelerate_interpolator" + android:duration="200" + /> + <alpha android:fromAlpha="1.0" android:toAlpha="0.0" + android:interpolator="@android:anim/decelerate_interpolator" + android:duration="150" + /> +</set>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/anim/fade_out_quick.xml b/OpenKeychain/src/main/res/anim/fade_out_quick.xml new file mode 100644 index 000000000..94fc508d7 --- /dev/null +++ b/OpenKeychain/src/main/res/anim/fade_out_quick.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<set xmlns:android="http://schemas.android.com/apk/res/android"> + <alpha android:fromAlpha="1.0" android:toAlpha="0.0" + android:interpolator="@android:anim/decelerate_interpolator" + android:duration="150" + /> +</set>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/anim/fade_out_up.xml b/OpenKeychain/src/main/res/anim/fade_out_up.xml new file mode 100644 index 000000000..65049a387 --- /dev/null +++ b/OpenKeychain/src/main/res/anim/fade_out_up.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<set xmlns:android="http://schemas.android.com/apk/res/android"> + <translate android:fromYDelta="0.0" android:toYDelta="-10" + android:interpolator="@android:anim/decelerate_interpolator" + android:duration="200" + /> + <alpha android:fromAlpha="1.0" android:toAlpha="0.0" + android:interpolator="@android:anim/decelerate_interpolator" + android:duration="150" + /> +</set>
\ No newline at end of file |