diff options
author | Christopher Baines <cbaines8@gmail.com> | 2012-02-19 10:42:04 +0000 |
---|---|---|
committer | Christopher Baines <cbaines8@gmail.com> | 2012-02-19 10:42:04 +0000 |
commit | 40bd59ae8615f05c8f9d1b542f35ae39f98c2f5d (patch) | |
tree | b6a6fa2fdbb7009859ef0ca4616a8b9c59169440 /src/net/cbaines/suma/TimetableAdapter.java | |
parent | 4b4a5a0ebc7f285d7cdcfa1d72640dbc097bdbb2 (diff) | |
parent | a02e8ae9eed3b2e3c105db19e84c27a0774172dd (diff) | |
download | southamptonuniversitymap-40bd59ae8615f05c8f9d1b542f35ae39f98c2f5d.tar southamptonuniversitymap-40bd59ae8615f05c8f9d1b542f35ae39f98c2f5d.tar.gz |
Merge branch 'dev'
Conflicts:
AndroidManifest.xml
res/values/strings.xml
Diffstat (limited to 'src/net/cbaines/suma/TimetableAdapter.java')
-rw-r--r-- | src/net/cbaines/suma/TimetableAdapter.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/net/cbaines/suma/TimetableAdapter.java b/src/net/cbaines/suma/TimetableAdapter.java index b4dfab5..9ec7a72 100644 --- a/src/net/cbaines/suma/TimetableAdapter.java +++ b/src/net/cbaines/suma/TimetableAdapter.java @@ -19,7 +19,6 @@ package net.cbaines.suma; -import android.content.Context; import android.util.Log; import android.view.View; import android.view.ViewGroup; @@ -29,14 +28,14 @@ import android.widget.BaseAdapter; public class TimetableAdapter extends BaseAdapter { - private final Context context; + private final BusStopActivity context; private Timetable timetable; private final Animation a; private boolean[] changed; private static final String TAG = "TimetableAdapter"; - public TimetableAdapter(Context context, Timetable timetable) { + public TimetableAdapter(BusStopActivity context, Timetable timetable) { this.context = context; this.timetable = timetable; this.a = AnimationUtils.loadAnimation(context, R.anim.updated_stop_view); |