sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'development' of https://github.com/siacs/Conversations into development

This commit is contained in:
iNPUTmice 2014-11-17 17:24:56 +01:00
parent 252c7e68d6 c7b8d3648a
commit 1a5af45afb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
View File

@ -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) {