aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-17 17:24:56 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-17 17:24:56 +0100
commit1a5af45afbb7302ae08d5475b647602a6f0463c2 (patch)
tree6e1df1c595e1c0514c1e92b540c508d744101da7 /src/main
parent252c7e68d6e0d0a43a310ff0f466e123dcbc5a90 (diff)
parentc7b8d3648a7b961b3c02a81b0dbed16183d22712 (diff)
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index c88cd3220..780f02177 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -1,10 +1,11 @@
package eu.siacs.conversations.ui;
-import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
import android.app.PendingIntent;
import android.content.Context;
import android.content.IntentSender.SendIntentException;
import android.graphics.Bitmap;
+import android.os.Build;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -259,7 +260,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
}
}
- @SuppressLint("JELLY_BEAN")
+ @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
private void setListItemBackgroundOnView(View view) {
int sdk = android.os.Build.VERSION.SDK_INT;
if (sdk < android.os.Build.VERSION_CODES.JELLY_BEAN) {