diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-04-11 21:43:38 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-04-11 21:43:38 +0200 |
commit | 1046acb3e192c940dc99ebb564ec2756493ec987 (patch) | |
tree | 5448f272fd7a0ca261785686ac66dfaf39f1c518 /src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java | |
parent | 551f63b73c170a309108c7d3dc8839e6ada86596 (diff) |
replace deprecated action bar with toolbar
* replace deprecated action bar with toolbar
* add toolbar support in each activity
* remove redundant themes made earlier
* add configure action bar method in xmpp activity
* remove android namespace from actionmodeoverlay
* solve bug of scrolling toolbar
Diffstat (limited to '')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java index 0a2dade8d..c1938aef9 100644 --- a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java +++ b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.databinding.DataBindingUtil; import android.os.Bundle; import android.support.v7.app.ActionBar; +import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.Gravity; import android.view.Menu; @@ -79,11 +80,8 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat binding.cancelButton.setOnClickListener(mCancelButtonListener); binding.saveButton.setOnClickListener(mSaveButtonListener); - - if (getSupportActionBar() != null) { - getSupportActionBar().setHomeButtonEnabled(true); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); - } + setSupportActionBar((Toolbar) binding.toolbar); + configureActionBar(getSupportActionBar()); if (savedInstanceState != null) { mUseCameraHintShown.set(savedInstanceState.getBoolean("camera_hint_shown", false)); |