diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-30 01:07:10 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-30 01:07:10 +0200 |
| commit | 9f9aa79066c48f2d4678c2d13893ea94b194032d (patch) | |
| tree | 04324acad6aca30dd046c1ee6f700959ba1bc3a6 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java | |
| parent | 43b8170a446143028207d4d377c8f669ad32de67 (diff) | |
| download | open-keychain-9f9aa79066c48f2d4678c2d13893ea94b194032d.tar.gz open-keychain-9f9aa79066c48f2d4678c2d13893ea94b194032d.tar.bz2 open-keychain-9f9aa79066c48f2d4678c2d13893ea94b194032d.zip | |
Fix conflicts
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java index b49731739..569ae82f0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java @@ -68,7 +68,8 @@ public class CreateKeyActivity extends ActionBarActivity { transaction.setCustomAnimations(R.anim.frag_slide_in_from_left, R.anim.frag_slide_out_to_right); break; case ANIM_TO_RIGHT: - transaction.setCustomAnimations(R.anim.frag_slide_out_to_left, R.anim.frag_slide_in_from_right); + transaction.setCustomAnimations(R.anim.frag_slide_out_to_left, R.anim.frag_slide_in_from_right, + R.anim.frag_slide_in_from_left, R.anim.frag_slide_out_to_right); transaction.addToBackStack("back"); break; |