diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-28 00:39:18 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-28 00:39:18 +0100 |
commit | fd55cdb08e47b87d2fdc98d15fc679725e2d2619 (patch) | |
tree | 015276c8b732179deda7aa1a5b6f3719671787bd /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java | |
parent | 453b67f7a8cb274d794843e54d6d050a7ef7a98a (diff) | |
parent | 9c62c3fd3985958a43707c7a25f07744a6cfcb95 (diff) | |
download | open-keychain-fd55cdb08e47b87d2fdc98d15fc679725e2d2619.tar.gz open-keychain-fd55cdb08e47b87d2fdc98d15fc679725e2d2619.tar.bz2 open-keychain-fd55cdb08e47b87d2fdc98d15fc679725e2d2619.zip |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java index ed9f3a02d..b6b2fcb8a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java @@ -25,10 +25,11 @@ import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.operations.results.OperationResult; import org.sufficientlysecure.keychain.remote.ui.AppsListFragment; import org.sufficientlysecure.keychain.util.Preferences; +import org.sufficientlysecure.keychain.util.FabContainer; import it.neokree.materialnavigationdrawer.MaterialNavigationDrawer; -public class MainActivity extends MaterialNavigationDrawer { +public class MainActivity extends MaterialNavigationDrawer implements FabContainer { @Override public void init(Bundle savedInstanceState) { @@ -66,4 +67,20 @@ public class MainActivity extends MaterialNavigationDrawer { } } + @Override + public void fabMoveUp(int height) { + Object fragment = getCurrentSection().getTargetFragment(); + if (fragment instanceof FabContainer) { + ((FabContainer) fragment).fabMoveUp(height); + } + } + + @Override + public void fabRestorePosition() { + Object fragment = getCurrentSection().getTargetFragment(); + if (fragment instanceof FabContainer) { + ((FabContainer) fragment).fabRestorePosition(); + } + } + } |