diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-30 00:50:53 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-30 00:50:53 +0200 |
commit | 6448de8f6ac84a8dcc91908af37c8826e32aa785 (patch) | |
tree | d1681d361ebd82a05c1600354b70b968cd98b347 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeActivity.java | |
parent | cce243299a400e9d68b9bd350fd75870f51b732f (diff) | |
download | open-keychain-6448de8f6ac84a8dcc91908af37c8826e32aa785.tar.gz open-keychain-6448de8f6ac84a8dcc91908af37c8826e32aa785.tar.bz2 open-keychain-6448de8f6ac84a8dcc91908af37c8826e32aa785.zip |
Create key with fragments
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeActivity.java index f4d395ae6..44416a25a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeActivity.java @@ -100,7 +100,7 @@ public class QrCodeActivity extends ActionBarActivity { super.onResume(); // custom activity transition to get zoom in effect - this.overridePendingTransition(R.anim.zoom_enter, android.R.anim.fade_out); + this.overridePendingTransition(R.anim.qr_code_zoom_enter, android.R.anim.fade_out); } @Override @@ -108,7 +108,7 @@ public class QrCodeActivity extends ActionBarActivity { super.onPause(); // custom activity transition to get zoom out effect - this.overridePendingTransition(0, R.anim.zoom_exit); + this.overridePendingTransition(0, R.anim.qr_code_zoom_exit); } }
\ No newline at end of file |