Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

android: fix bug introduced by manual merge of previous commit.

This commit is contained in:
Joachim Fritzsch 2013-06-11 14:07:10 +02:00
parent 82c3c6d2f1
commit c518170452
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/BOINC/src/edu/berkeley/boinc/adapter/TasksListAdapter.java
View File

@ -199,7 +199,6 @@ public class TasksListAdapter extends ArrayAdapter<TaskData>{
return v; return v;
} }
<<<<<<< HEAD
private void determineProgress(TaskData data, TextView progress, ProgressBar pb) { private void determineProgress(TaskData data, TextView progress, ProgressBar pb) {
Float fraction = Float.valueOf((float) 1.0); // default is 100 (e.g. abort show full red progress bar) Float fraction = Float.valueOf((float) 1.0); // default is 100 (e.g. abort show full red progress bar)
if(!data.result.active_task && data.result.ready_to_report) { //fraction not available if(!data.result.active_task && data.result.ready_to_report) { //fraction not available
@ -214,9 +213,6 @@ public class TasksListAdapter extends ArrayAdapter<TaskData>{
private Bitmap getIcon(int position) { private Bitmap getIcon(int position) {
=======
public Bitmap getIcon(int position) {
>>>>>>> Fixed issue with default icons being used in TaskList view
return Monitor.getClientStatus().getProjectIcon(entries.get(position).result.project_url); return Monitor.getClientStatus().getProjectIcon(entries.get(position).result.project_url);
} }