diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-09 16:03:58 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-09 16:03:58 +0100 |
commit | 72c18734ad2841bd57a91917c419d30cd97a4022 (patch) | |
tree | f6144d18157073a72de043b69b3c9a4b42e59c6f /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BaseActivity.java | |
parent | c50dceab32cd84349cfd414f8b64b8dea5bb209b (diff) | |
download | open-keychain-72c18734ad2841bd57a91917c419d30cd97a4022.tar.gz open-keychain-72c18734ad2841bd57a91917c419d30cd97a4022.tar.bz2 open-keychain-72c18734ad2841bd57a91917c419d30cd97a4022.zip |
Redesign of encrypt activites finished
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BaseActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BaseActivity.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BaseActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BaseActivity.java index e6c2542a2..41fa50705 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BaseActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BaseActivity.java @@ -88,12 +88,20 @@ public abstract class BaseActivity extends ActionBarActivity { /** * Close button only */ - protected void setFullScreenDialogClose(View.OnClickListener cancelOnClickListener) { - setActionBarIcon(R.drawable.ic_close_white_24dp); + protected void setFullScreenDialogClose(View.OnClickListener cancelOnClickListener, boolean white) { + if (white) { + setActionBarIcon(R.drawable.ic_close_white_24dp); + } else { + setActionBarIcon(R.drawable.ic_close_black_24dp); + } getSupportActionBar().setDisplayShowTitleEnabled(true); mToolbar.setNavigationOnClickListener(cancelOnClickListener); } + protected void setFullScreenDialogClose(View.OnClickListener cancelOnClickListener) { + setFullScreenDialogClose(cancelOnClickListener, true); + } + /** * Inflate custom design with two buttons using drawables. * This does not conform to the Material Design Guidelines, but we deviate here as this is used |