diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2012-03-06 15:11:31 +0000 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2012-03-06 15:11:31 +0000 |
| commit | 4a45362d8823a84cf9c3c805c006331303a0da33 (patch) | |
| tree | daf44d72c5a39a057955e71fecfe576361e0a623 | |
| parent | a722eac92e7154563bd144ad91b092d23dae8f2a (diff) | |
| download | southamptonuniversitymap-4a45362d8823a84cf9c3c805c006331303a0da33.tar southamptonuniversitymap-4a45362d8823a84cf9c3c805c006331303a0da33.tar.gz | |
Bumped android:minSdkVersion to 8, as implementing search stuff.dev-search
| -rw-r--r-- | AndroidManifest.xml | 8 | ||||
| -rw-r--r-- | src/net/cbaines/suma/Bus.java | 3 | ||||
| -rw-r--r-- | src/net/cbaines/suma/MapActivity.java | 2 | ||||
| -rw-r--r-- | src/net/cbaines/suma/SearchActivity.java (renamed from src/net/cbaines/suma/FindActivity.java) | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4dfff99..423c58b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -5,7 +5,7 @@ android:versionName="0.6.5 (alpha)" > <uses-sdk - android:minSdkVersion="7" + android:minSdkVersion="8" android:targetSdkVersion="10" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> @@ -53,12 +53,8 @@ <intent-filter> <action android:name="android.intent.action.SEARCH" /> </intent-filter> - - <meta-data - android:name="android.app.searchable" - android:resource="@xml/searchable" /> </activity> - <activity android:name="FindActivity" > + <activity android:name=".SearchActivity" > <intent-filter> <action android:name="android.intent.action.SEARCH" /> </intent-filter> diff --git a/src/net/cbaines/suma/Bus.java b/src/net/cbaines/suma/Bus.java index 34e20a6..9894e6b 100644 --- a/src/net/cbaines/suma/Bus.java +++ b/src/net/cbaines/suma/Bus.java @@ -35,6 +35,9 @@ public class Bus { final static String ROUTE_FIELD_NAME = "route"; final static String DIRECTION_FIELD_NAME = "direction"; + @DatabaseField(generatedId = true) + int gid; + /** * The identification number of the bus. */ diff --git a/src/net/cbaines/suma/MapActivity.java b/src/net/cbaines/suma/MapActivity.java index 6c4664e..e966b57 100644 --- a/src/net/cbaines/suma/MapActivity.java +++ b/src/net/cbaines/suma/MapActivity.java @@ -326,7 +326,7 @@ public class MapActivity extends ToastHelperActivity implements MapViewConstants @Override public boolean onSearchRequested() { Bundle appData = new Bundle(); - appData.putInt(FindActivity.ORIGIN, FindActivity.MAP_ACTIVITY); + appData.putInt(SearchActivity.ORIGIN, SearchActivity.MAP_ACTIVITY); startSearch(null, false, appData, false); return true; } diff --git a/src/net/cbaines/suma/FindActivity.java b/src/net/cbaines/suma/SearchActivity.java index 5a07807..f7f5e55 100644 --- a/src/net/cbaines/suma/FindActivity.java +++ b/src/net/cbaines/suma/SearchActivity.java @@ -53,7 +53,7 @@ import com.j256.ormlite.dao.Dao; import com.j256.ormlite.stmt.PreparedQuery; import com.j256.ormlite.stmt.QueryBuilder; -public class FindActivity extends OrmLiteBaseActivity<DatabaseHelper> implements Runnable, TextWatcher, +public class SearchActivity extends OrmLiteBaseActivity<DatabaseHelper> implements Runnable, TextWatcher, OnItemClickListener, LocationListener, OnItemLongClickListener { final static String TAG = "FindActivity"; |