diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2012-03-05 15:15:10 +0000 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2012-03-05 15:15:10 +0000 |
| commit | 7d48b4d5c1a57ae12b55905b2f7cfa5d3623fbc6 (patch) | |
| tree | 0c342f44414fffa65c8576bc2da60da8aec8a247 | |
| parent | 05b47389b46e3085a341eb1e32a36c69ad90e2b7 (diff) | |
| parent | 930f1771a4df314f3a727b035c1c5f1c1074aedb (diff) | |
| download | southamptonuniversitymap-7d48b4d5c1a57ae12b55905b2f7cfa5d3623fbc6.tar southamptonuniversitymap-7d48b4d5c1a57ae12b55905b2f7cfa5d3623fbc6.tar.gz | |
Merge branch 'dev' of https://github.com/cbaines/SouthamptonUniversityMap into dev
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/net/cbaines/suma/POIView.java | 6 |
3 files changed, 4 insertions, 8 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 89ae86d..c322b63 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="net.cbaines.suma" - android:versionCode="9" - android:versionName="0.6 (alpha)" > + android:versionCode="10" + android:versionName="0.6.5 (alpha)" > <uses-sdk android:minSdkVersion="7" diff --git a/res/values/strings.xml b/res/values/strings.xml index 05ed277..e17ab11 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -106,7 +106,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< <!-- About Strings --> <string name="about">About</string> <string name="about_version">Version</string> - <string name="about_version_summary">0.6 (alpha)</string> + <string name="about_version_summary">0.6.5 (alpha)</string> <string name="about_copyright">Copyright</string> <string name="about_copyright_summary">© 2012, Christopher Baines</string> <string name="about_license">License</string> diff --git a/src/net/cbaines/suma/POIView.java b/src/net/cbaines/suma/POIView.java index 95c571c..6324aeb 100644 --- a/src/net/cbaines/suma/POIView.java +++ b/src/net/cbaines/suma/POIView.java @@ -91,11 +91,7 @@ public class POIView extends LinearLayout implements Preferences { Building building = (Building) poi; // Log.i(TAG, "Its a building of name " + building.name); - if (identifiersEnabled) { - name.setText(building.name + " (" + building.id + ")"); - } else { - name.setText(building.name); - } + name.setText(building.name + " (" + building.id + ")"); } else if (poi.type == POI.BUS_STOP) { BusStop busStop = (BusStop) poi; |