phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/jonatkins/ingress-intel-total-conversion

Browse Source
This commit is contained in:
Jon Atkins 2013-07-28 18:39:43 +01:00
commit d177c27a6d
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/src/com/cradle/iitc_mobile/async/UrlContentToString.java
View File

@ -2,8 +2,6 @@ package com.cradle.iitc_mobile.async;
import android.os.AsyncTask; import android.os.AsyncTask;
import com.cradle.iitc_mobile.IITC_Mobile;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.util.Scanner; import java.util.Scanner;

7
mobile/src/com/cradle/iitc_mobile/share/IntentListView.java
View File

@ -3,7 +3,6 @@ package com.cradle.iitc_mobile.share;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import android.annotation.TargetApi;
import android.app.Activity; import android.app.Activity;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
@ -12,7 +11,6 @@ import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Build;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Pair; import android.util.Pair;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -42,7 +40,6 @@ public class IntentListView extends ListView {
super(IntentListView.this.getContext(), android.R.layout.simple_list_item_1); super(IntentListView.this.getContext(), android.R.layout.simple_list_item_1);
} }
@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
@Override @Override
public View getView(int position, View convertView, ViewGroup parent) { public View getView(int position, View convertView, ViewGroup parent) {
LayoutInflater inflater = ((Activity) getContext()).getLayoutInflater(); LayoutInflater inflater = ((Activity) getContext()).getLayoutInflater();
@ -54,9 +51,7 @@ public class IntentListView extends ListView {
view.setText(label); view.setText(label);
view.setCompoundDrawablePadding((int) getResources().getDimension(R.dimen.icon_margin)); view.setCompoundDrawablePadding((int) getResources().getDimension(R.dimen.icon_margin));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { view.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
view.setCompoundDrawablesRelativeWithIntrinsicBounds(icon, null, null, null);
}
return view; return view;
} }