diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2012-02-08 12:26:56 +0000 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2012-02-08 12:26:56 +0000 |
| commit | cccc62990e9b3736d7b5b86acd7acf7dcd8de8c3 (patch) | |
| tree | 01f88a5b27751142b89d7f474777305f7ea942d5 | |
| parent | 72aad0e9de176d41999587166a1914bcf7410e54 (diff) | |
| download | southamptonuniversitymap-cccc62990e9b3736d7b5b86acd7acf7dcd8de8c3.tar southamptonuniversitymap-cccc62990e9b3736d7b5b86acd7acf7dcd8de8c3.tar.gz | |
Moved the route movement stuff to a branch.
| -rw-r--r-- | gen/net/cbaines/suma/R.java | 4 | ||||
| -rw-r--r-- | res/menu/stop_menu.xml | 8 | ||||
| -rw-r--r-- | src/net/cbaines/suma/BusStopActivity.java | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/gen/net/cbaines/suma/R.java b/gen/net/cbaines/suma/R.java index c18db21..ba914fb 100644 --- a/gen/net/cbaines/suma/R.java +++ b/gen/net/cbaines/suma/R.java @@ -84,8 +84,10 @@ public final class R { public static final int menu_favourites=0x7f0a0028; public static final int menu_find=0x7f0a0023; public static final int menu_find_my_location=0x7f0a0025; + public static final int menu_next_stop=0x7f0a002b; public static final int menu_preferences=0x7f0a0024; - public static final int menu_refresh_stop=0x7f0a0029; + public static final int menu_previous_stop=0x7f0a0029; + public static final int menu_refresh_stop=0x7f0a002a; public static final int menu_view=0x7f0a0026; public static final int radio_u1=0x7f0a0006; public static final int radio_u1n=0x7f0a0007; diff --git a/res/menu/stop_menu.xml b/res/menu/stop_menu.xml index 408e536..c44efa2 100644 --- a/res/menu/stop_menu.xml +++ b/res/menu/stop_menu.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android" > - <!--<item + <item android:id="@+id/menu_previous_stop" android:icon="@drawable/ic_menu_back" - android:title="@string/menu_previous_stop"/>--> + android:title="@string/menu_previous_stop"/> <item android:id="@+id/menu_refresh_stop" android:icon="@drawable/ic_menu_refresh" android:title="@string/menu_refresh_stop"/> - <!--<item + <item android:id="@+id/menu_next_stop" android:icon="@drawable/ic_menu_forward" - android:title="@string/menu_next_stop"/>--> + android:title="@string/menu_next_stop"/> </menu>
\ No newline at end of file diff --git a/src/net/cbaines/suma/BusStopActivity.java b/src/net/cbaines/suma/BusStopActivity.java index 6c46d03..1f99b8a 100644 --- a/src/net/cbaines/suma/BusStopActivity.java +++ b/src/net/cbaines/suma/BusStopActivity.java @@ -334,7 +334,7 @@ public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper> impleme @Override public boolean onOptionsItemSelected(MenuItem item) { // Handle item selection - if (false) { // (item.getItemId() == R.id.menu_previous_stop || item.getItemId() == R.id.menu_next_stop) { + if (item.getItemId() == R.id.menu_previous_stop || item.getItemId() == R.id.menu_next_stop) { Log.v(TAG, "Got a request for the stop movement"); Log.v(TAG, routes.size() + " routes avalible from this stop"); @@ -343,7 +343,7 @@ public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper> impleme for (BusRoute route : routes) { try { - if (false) { // (item.getItemId() == R.id.menu_next_stop) { + if (item.getItemId() == R.id.menu_next_stop) { busStops.add(route.moveInRoute(this, getHelper().getBusStopDao().queryForId(busStopID), null, 1)); } else { busStops.add(route.moveInRoute(this, getHelper().getBusStopDao().queryForId(busStopID), null, -1)); |