aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
Commit message (Collapse)AuthorAgeFilesLines
* Manage my keys wizardDominik Schürmann2015-03-191-1/+3
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-02-281-1/+18
|\ | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
| * control flow for moving the fab up with snackbarVincent Breitmoser2015-02-281-2/+18
| |
* | Update from transifexDominik Schürmann2015-02-281-2/+0
|/
* Simplify MainActivityDominik Schürmann2015-02-281-2/+23
|
* Fix multi select and more colorsDominik Schürmann2015-02-221-2/+0
|
* Move key list logic into fragment, UI fixes for nav drawerDominik Schürmann2015-01-291-0/+52