From f251623b9ae1a997c63ce876664a309435457f7a Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 24 Jul 2013 17:22:39 +0200 Subject: [PATCH] some small enhancements to voice testing --- .../plus/development/TestVoiceActivity.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java b/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java index a98fe7cae0..525035c508 100644 --- a/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java +++ b/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java @@ -82,18 +82,18 @@ public class TestVoiceActivity extends SherlockActivity { } private void addButtons(final LinearLayout ll, CommandPlayer p) { - addButton(ll, "New route was calculated (15350m & 2h30m5sec)", builder(p).newRouteCalculated(15350, 9005)); - addButton(ll, "After 1050m turn slightly left 'to Strasse'", builder(p).turn(AbstractPrologCommandPlayer.A_LEFT_SL, 1050, "Strasse")); - addButton(ll, "Turn left 'to Street'", builder(p).turn(AbstractPrologCommandPlayer.A_LEFT, "Street")); - addButton(ll, "Prepare to turn right after 320m 'to Mini'", builder(p).prepareTurn(AbstractPrologCommandPlayer.A_RIGHT, 320, "Mini")); - addButton(ll, "After 370m turn sharply right 'to F23'", builder(p).turn(AbstractPrologCommandPlayer.A_RIGHT_SH, 370, "F23")); + addButton(ll, "New route has been calculated (15350m & 2h30m5sec)", builder(p).newRouteCalculated(15350, 9005)); + addButton(ll, "After 1050m turn slightly left 'onto Hauptstrasse'", builder(p).turn(AbstractPrologCommandPlayer.A_LEFT_SL, 1050, "Strasse")); + addButton(ll, "Turn left 'onto Street'", builder(p).turn(AbstractPrologCommandPlayer.A_LEFT, "Street")); + addButton(ll, "Prepare to turn right after 320m 'onto Mini'", builder(p).prepareTurn(AbstractPrologCommandPlayer.A_RIGHT, 320, "Mini")); + addButton(ll, "After 370m turn sharply right 'onto F23'", builder(p).turn(AbstractPrologCommandPlayer.A_RIGHT_SH, 370, "F23")); addButton(ll, "Prepare to turn slighlty left after 850m then bear right", builder(p).prepareTurn(AbstractPrologCommandPlayer.A_LEFT_SL, 850, "").then().bearRight("")); - addButton(ll, "Turn sharply right 'to Street' then bear left ", builder(p).turn(AbstractPrologCommandPlayer.A_RIGHT_SH, "Street").then().bearLeft("")); + addButton(ll, "Turn sharply right 'onto Street' then bear left ", builder(p).turn(AbstractPrologCommandPlayer.A_RIGHT_SH, "Street").then().bearLeft("")); addButton(ll, "Prepare to make a U-turn after 400m", builder(p).prepareMakeUT(400, "")); - addButton(ll, "After 640m make a U-turn ", builder(p).makeUT(640, "")); + addButton(ll, "After 640m make a U-turn", builder(p).makeUT(640, "")); addButton(ll, "Prepare to keep left '' after 370m", builder(p).prepareTurn(AbstractPrologCommandPlayer.A_LEFT_KEEP, 370, "")); addButton(ll, "Keep left '' then after 400m keep right 'A1'", builder(p).turn(AbstractPrologCommandPlayer.A_LEFT_KEEP, "").then().turn(AbstractPrologCommandPlayer.A_RIGHT_KEEP, 400, "A1")); - addButton(ll, "Make a U-turn 'to Riviera' ", builder(p).makeUT("Riviera")); + addButton(ll, "Make a U-turn 'to Riviera'", builder(p).makeUT("Riviera")); addButton(ll, "When possible, make a U-turn", builder(p).makeUTwp()); addButton(ll, "Prepare to enter a roundabout (3rd exit) 'Liberty' after 750m", builder(p).prepareRoundAbout(750, 3, "Liberty")); addButton(ll, "After 450m enter the roundabout and take the 1st exit 'to Place'", builder(p).roundAbout(450, 0, 1, "Place")); @@ -106,8 +106,8 @@ public class TestVoiceActivity extends SherlockActivity { addButton(ll, "Follow the road 'A33' for 800m and arrive at destination", builder(p).goAhead(800, "A33").andArriveAtDestination("")); addButton(ll, "Arrive at destination 'Home'", builder(p).arrivedAtDestination("Home")); addButton(ll, "Arrive at waypoint 'GPX point'", builder(p).arrivedAtWayPoint("GPX point")); - addButton(ll, "You are off the route for 1050m", builder(p).offRoute(1050)); - addButton(ll, "You exceed speed limit", builder(p).speedAlarm()); + addButton(ll, "You have been off the route for 1050m", builder(p).offRoute(1050)); + addButton(ll, "You are exceeding the speed limit", builder(p).speedAlarm()); addButton(ll, "Attention (speed camera) /bump...", builder(p).attention("speed camera")); ll.forceLayout(); }