From e3fa33a1bfca1160ae0818be8227771e125cf766 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Fri, 9 Mar 2018 20:44:45 +0100 Subject: reference support actionbar in all activities --- src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java') diff --git a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java index 853b1b2a4..48a9125ce 100644 --- a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java +++ b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java @@ -1,8 +1,8 @@ package de.pixart.messenger.ui; -import android.app.ActionBar; import android.content.Intent; import android.os.Bundle; +import android.support.v7.app.ActionBar; import android.util.Log; import android.view.Gravity; import android.view.Menu; @@ -109,9 +109,9 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat mSaveButton.setOnClickListener(mSaveButtonListener); - if (getActionBar() != null) { - getActionBar().setHomeButtonEnabled(true); - getActionBar().setDisplayHomeAsUpEnabled(true); + if (getSupportActionBar() != null) { + getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); } if (savedInstanceState != null) { @@ -135,7 +135,7 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat private void showCameraToast() { mUseCameraHintToast = Toast.makeText(this,R.string.use_camera_icon_to_scan_barcode,Toast.LENGTH_LONG); - ActionBar actionBar = getActionBar(); + ActionBar actionBar = getSupportActionBar(); mUseCameraHintToast.setGravity(Gravity.TOP | Gravity.END, 0 ,actionBar == null ? 0 : actionBar.getHeight()); mUseCameraHintToast.show(); } -- cgit v1.2.3