Commit Graph

5 Commits

Author SHA1 Message Date
Vincent Breitmoser
4df63ccdeb displaytext: add "View Log" option, move "Copy to clipboard" into overflow menu 2016-02-22 22:22:45 +01:00
Vincent Breitmoser
1865852ccc Merge remote-tracking branch 'origin/development' into linked-identities
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
	OpenKeychain/src/main/res/menu/decrypt_menu.xml
2015-04-26 01:02:22 +02:00
Dominik Schürmann
c442d3bd0d Put decrypt result in toolbar, some ui fixes for decrypt 2015-04-26 00:33:26 +02:00
Vincent Breitmoser
96853a15ee revamp decrypt ui 2015-04-24 19:17:05 +02:00
Vincent Breitmoser
ca9ab02b7b revamp decrypt ui 2015-04-24 19:00:33 +02:00