fixed up button on v21 devices
This commit is contained in:
parent
32a16137df
commit
04f4680582
|
@ -2,6 +2,7 @@ package eu.siacs.conversations.ui;
|
||||||
|
|
||||||
import android.annotation.SuppressLint;
|
import android.annotation.SuppressLint;
|
||||||
import android.annotation.TargetApi;
|
import android.annotation.TargetApi;
|
||||||
|
import android.app.ActionBar;
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
import android.app.AlertDialog;
|
import android.app.AlertDialog;
|
||||||
import android.app.AlertDialog.Builder;
|
import android.app.AlertDialog.Builder;
|
||||||
|
@ -300,12 +301,15 @@ public abstract class XmppActivity extends Activity {
|
||||||
mColorOrange = getResources().getColor(R.color.orange);
|
mColorOrange = getResources().getColor(R.color.orange);
|
||||||
mColorGreen = getResources().getColor(R.color.green);
|
mColorGreen = getResources().getColor(R.color.green);
|
||||||
mPrimaryColor = getResources().getColor(R.color.primary);
|
mPrimaryColor = getResources().getColor(R.color.primary);
|
||||||
mSecondaryBackgroundColor = getResources().getColor(
|
mSecondaryBackgroundColor = getResources().getColor(R.color.secondarybackground);
|
||||||
R.color.secondarybackground);
|
|
||||||
this.mTheme = findTheme();
|
this.mTheme = findTheme();
|
||||||
setTheme(this.mTheme);
|
setTheme(this.mTheme);
|
||||||
this.mUsingEnterKey = usingEnterKey();
|
this.mUsingEnterKey = usingEnterKey();
|
||||||
mUseSubject = getPreferences().getBoolean("use_subject", true);
|
mUseSubject = getPreferences().getBoolean("use_subject", true);
|
||||||
|
final ActionBar ab = getActionBar();
|
||||||
|
if (ab!=null) {
|
||||||
|
ab.setDisplayHomeAsUpEnabled(true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected boolean usingEnterKey() {
|
protected boolean usingEnterKey() {
|
||||||
|
|
Loading…
Reference in a new issue