From 19e189ef9ed67f382fea00e48f997ce8e979f030 Mon Sep 17 00:00:00 2001
From: Christopher Baines <cbaines8@gmail.com>
Date: Wed, 14 Mar 2012 01:00:56 +0000
Subject: Update for beta release.

---
 res/layout/about_dialog.xml | 33 ---------------------------------
 res/values/strings.xml      | 16 +++-------------
 res/xml/searchable.xml      |  3 ++-
 3 files changed, 5 insertions(+), 47 deletions(-)
 delete mode 100644 res/layout/about_dialog.xml

(limited to 'res')

diff --git a/res/layout/about_dialog.xml b/res/layout/about_dialog.xml
deleted file mode 100644
index 03a68ad..0000000
--- a/res/layout/about_dialog.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <TextView
-        android:id="@+id/textView1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/app_name"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-    <TextView
-        android:id="@+id/textView2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/about_menu_instruction_text" />
-
-    <ExpandableListView
-        android:id="@+id/helpExpandableListView"
-        android:layout_width="fill_parent"
-        android:layout_height="0dip"
-        android:layout_weight="0.05" >
-    </ExpandableListView>
-
-    <Button
-        android:id="@+id/donateButton"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/donate_button" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6f6cecc..208f4eb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -19,13 +19,13 @@
     <string name="menu_about">About</string>
     <string name="menu_favourites">Favourites</string>
     <string name="search_settings_description">Southampton University Map</string>
-    <string name="search_results_dialog_title">Search Results</string>
+    <string name="search_results_dialog_title">Search Results for\u0020</string>
 
     <!-- Welcome Dialog -->
     <string name="welcome_dialog_title">Southampton University Map App</string>
     <string name="welcome_dialog_version">Version 0.9 (beta)</string>
     <string name="welcome_dialog_copyright">© 2011 Christopher Baines</string>
-    <string name="welcome_dialog_upgrade_message">Thanks for upgrading this app, and it\'s hoped that its better for you than the previous version. Noteable changes include\:\n
+    <string name="welcome_dialog_upgrade_message">Thanks for upgrading this app, and it\'s hoped that its better for you than the previous version. Noteable changes include:\n
  • This message\n
  • New Search interface\n
 
@@ -38,7 +38,7 @@ of the License, or (at your option) any later version.\n
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.</string>
-    <string name="welcome_dialog_install_message">Welcome to the Southampton University Map App. Noteable features include\:\n
+    <string name="welcome_dialog_install_message">Welcome to the Southampton University Map App. Noteable features include:\n
  • Search for Buildings and Bus Stops\n
  • Get Live Bus Times\n
 
@@ -52,15 +52,6 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.</string>
 
-    <!-- Help Messages -->
-    <string name="map_help_message">You can drag the map to move it, you can use pinch motions to zoom in and out, this can also be done with the buttons at the bottom of the screen. Taping the building markers will show you there full name, and tapping the bus stop markers will show the live times at that stop. Presing and holding a marker, will add the item to the favourites list.</string>
-    <string name="find_help_message">The Find screen allows you to search for buildings, bus stops and sites. You can search by description and id. If your location is known, the results will be sorted by distance from your current location.</string>
-    <string name="preferences_help_message">You can disable and enable the apps use of live bus times and gps positioning from the preferences screen.</string>
-    <string name="findmylocation_help_message">When you press the Find my Location button on the menu, the map view will move to your location, and zoom in.</string>
-    <string name="view_help_message">Use the options in the View dialog to enable and disable the map elements.</string>
-    <string name="about_help_message">The About screen displays the help messages and also the contact details of the developer. You also have the option of making a Bitcoin donation using the Donate button at the bottom. WARNING, the donation address is not private as it is hardcoded in to the app.</string>
-    <string name="favourites_help_message">The favourites dialog includes a list of buildings or bus stops marked as favourites, this is meant to allow for easier access to frequently used locations.</string>
-    <string name="credits_help_message">Data:  Map Icons: From the "Map Icons Collection" (http://mapicons.nicolasmollet.com). Map Tiles: From the Mapnik project, through the OSMDroid libary. Database: Using the ORMLite libary.</string>
     <string name="donate_button">Donate</string>
     <string name="bitcoin_error_message">You appear to have no bitcoin client installed, or at least none that listen for bitcoin uri\'s. Either install such a client, or just send coins via any method from any device to the address below.</string>
     <string name="preferences">Preferences</string>
@@ -113,7 +104,6 @@ GNU General Public License for more details.</string>
     <string name="preferences_non_uni_link_disabled">Non Uni-Link Bus Stops Disabled</string>
 
     <!-- About Messages -->
-    <string name="about_menu_instruction_text">Expand the items below to learn more about each feature of the application.</string>
     <string name="bustimes_favourite_checkbox_label">Favourite</string>
     <string name="donate_dialog_message">Loading bitcoin client</string>
     <string name="donate_dialog_error_title">Error</string>
diff --git a/res/xml/searchable.xml b/res/xml/searchable.xml
index d6dedc8..34c6f76 100644
--- a/res/xml/searchable.xml
+++ b/res/xml/searchable.xml
@@ -7,6 +7,7 @@
     android:searchSuggestAuthority="net.cbaines.suma.provider"
     android:searchSuggestIntentAction="android.intent.action.VIEW"
     android:searchSuggestSelection=" ?"
-    android:searchSuggestThreshold="1" >
+    android:searchSuggestThreshold="1"
+    android:voiceSearchMode="showVoiceSearchButton|launchRecognizer" >
 
 </searchable>
\ No newline at end of file
-- 
cgit v1.2.3