Merge branch 'master' of github.com:osmandapp/Osmand
This commit is contained in:
Victor Shcherb
commit
96053e81b0
3 changed files with 200 additions and 2 deletions
99
OsmAnd/res/drawable/img_help_vessel_height_day.xml
Normal file
99
OsmAnd/res/drawable/img_help_vessel_height_day.xml
Normal file
|
|
@ -0,0 +1,99 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="360dp"
|
||||
android:height="90dp"
|
||||
android:viewportWidth="360"
|
||||
android:viewportHeight="90">
|
||||
<path
|
||||
android:pathData="M174,0H0V90H174V0Z"
|
||||
android:fillColor="#F5F5F5"/>
|
||||
<path
|
||||
android:pathData="M360,0H186V90H360V0Z"
|
||||
android:fillColor="#F5F5F5"/>
|
||||
<path
|
||||
android:pathData="M0,12V22H2C5.314,22 8,24.686 8,28V90H26V28C26,24.686 28.686,22 32,22H142C145.314,22 148,24.686 148,28V90H166V28C166,24.686 168.686,22 172,22H174V12H0Z"
|
||||
android:fillColor="#D7D8DB"/>
|
||||
<path
|
||||
android:pathData="M224,32L244,12H256L233.801,39.748C232.663,41.172 230.939,42 229.116,42H218C214.686,42 212,44.686 212,48V90H194V48C194,44.686 191.314,42 188,42H186V32H224Z"
|
||||
android:fillColor="#D7D8DB"/>
|
||||
<path
|
||||
android:pathData="M322,32L302,12H290L312.199,39.748C313.337,41.172 315.061,42 316.884,42H328C331.314,42 334,44.686 334,48V90H352V48C352,44.686 354.686,42 358,42H360V32H322Z"
|
||||
android:fillColor="#D7D8DB"/>
|
||||
<path
|
||||
android:pathData="M0,85V90H174V80.391C164.31,86.609 153.528,86.146 144,79C133.811,86.642 122.189,86.642 112,79C101.811,86.642 90.189,86.642 80,79C69.811,86.642 58.189,86.642 48,79C37.811,86.642 26.189,86.642 16,79C8,85 0,85 0,85Z"
|
||||
android:strokeAlpha="0.5"
|
||||
android:fillColor="#237BFF"
|
||||
android:fillAlpha="0.5"/>
|
||||
<path
|
||||
android:pathData="M89,32C89,30.895 88.105,30 87,30C85.895,30 85,30.895 85,32V36H89V32Z"
|
||||
android:fillColor="#237BFF"/>
|
||||
<path
|
||||
android:pathData="M71,44C71,40.686 73.686,38 77,38H97C100.314,38 103,40.686 103,44V54H71V44ZM75,44H85V50H75V44ZM89,44H99V50H89V44Z"
|
||||
android:fillColor="#237BFF"
|
||||
android:fillType="evenOdd"/>
|
||||
<path
|
||||
android:pathData="M63,56V65.8C63,70.492 65.735,74.753 70,76.708L72.863,78.021C70.225,79.295 67.32,80 64,80C57.424,80 52.476,77.233 48,72.757C43.524,77.233 38.576,80 32,80C25.424,80 20.476,77.233 16,72.757C12.574,76.183 9.031,79.268 4.044,80.035C2.148,80.326 0.663,80.211 0,80.125V86.156C1.166,86.253 2.89,86.283 4.956,85.965C8.156,85.473 12.143,84.146 16.038,80.998C20.538,84.398 26.357,86 32,86C37.659,86 43.494,84.389 48,80.969C52.506,84.389 58.341,86 64,86C69.547,86 75.265,84.452 79.732,81.169L81.325,81.899C85.618,84.682 90.881,86 96,86C101.659,86 107.494,84.389 112,80.969C116.506,84.389 122.341,86 128,86C133.659,86 139.494,84.389 144,80.969C148.506,84.389 154.341,86 160,86C164.853,86 169.837,84.815 174,82.32V74.5C170.69,77.81 165.405,80 160,80C153.424,80 148.476,77.233 144,72.757C139.524,77.233 134.576,80 128,80C121.424,80 116.476,77.233 112,72.757C107.72,77.038 103.008,79.755 96.853,79.984L104,76.708C108.265,74.753 111,70.492 111,65.8V56H63ZM79,62V66.5L71,62H79ZM95,62V66.5L103,62H95Z"
|
||||
android:fillColor="#237BFF"
|
||||
android:fillType="evenOdd"/>
|
||||
<path
|
||||
android:pathData="M275,32C275,30.895 274.105,30 273,30C271.895,30 271,30.895 271,32V36H275V32Z"
|
||||
android:fillColor="#237BFF"/>
|
||||
<path
|
||||
android:pathData="M257,44C257,40.686 259.686,38 263,38H283C286.314,38 289,40.686 289,44V54H257V44ZM261,44H271V50H261V44ZM275,44H285V50H275V44Z"
|
||||
android:fillColor="#237BFF"
|
||||
android:fillType="evenOdd"/>
|
||||
<path
|
||||
android:pathData="M249,56V65.8C249,70.492 251.735,74.753 256,76.708L258.863,78.021C256.225,79.295 253.32,80 250,80C243.424,80 238.476,77.233 234,72.757C229.524,77.233 224.576,80 218,80C211.424,80 206.476,77.233 202,72.757C198.574,76.183 195.031,79.268 190.044,80.035C188.148,80.326 186.663,80.211 186,80.125V86.156C187.166,86.253 188.89,86.283 190.956,85.965C194.156,85.473 198.143,84.146 202.038,80.998C206.538,84.398 212.357,86 218,86C223.659,86 229.494,84.389 234,80.969C238.506,84.389 244.341,86 250,86C255.547,86 261.265,84.452 265.732,81.169L267.325,81.899C271.618,84.682 276.881,86 282,86C287.659,86 293.494,84.389 298,80.969C302.506,84.389 308.341,86 314,86C319.659,86 325.494,84.389 330,80.969C334.506,84.389 340.341,86 346,86C350.853,86 355.837,84.815 360,82.32V74.5C356.69,77.81 351.405,80 346,80C339.424,80 334.476,77.233 330,72.757C325.524,77.233 320.576,80 314,80C307.424,80 302.476,77.233 298,72.757C293.72,77.038 289.008,79.755 282.853,79.984L290,76.708C294.265,74.753 297,70.492 297,65.8V56H249ZM265,62V66.5L257,62H265ZM281,62V66.5L289,62H281Z"
|
||||
android:fillColor="#237BFF"
|
||||
android:fillType="evenOdd"/>
|
||||
<path
|
||||
android:pathData="M54,23L60,29L66,23L54,23Z"
|
||||
android:fillColor="#EE5622"/>
|
||||
<path
|
||||
android:pathData="M54,90L60,84L66,90H54Z"
|
||||
android:fillColor="#EE5622"/>
|
||||
<path
|
||||
android:pathData="M59,33C59,32.448 59.448,32 60,32C60.552,32 61,32.448 61,33V40C61,40.552 60.552,41 60,41C59.448,41 59,40.552 59,40V33Z"
|
||||
android:fillColor="#EE5622"/>
|
||||
<path
|
||||
android:pathData="M59,59C59,58.448 59.448,58 60,58C60.552,58 61,58.448 61,59L61,66C61,66.552 60.552,67 60,67C59.448,67 59,66.552 59,66L59,59Z"
|
||||
android:fillColor="#EE5622"/>
|
||||
<path
|
||||
android:pathData="M60,71C59.448,71 59,71.448 59,72L59,79C59,79.552 59.448,80 60,80C60.552,80 61,79.552 61,79L61,72C61,71.448 60.552,71 60,71Z"
|
||||
android:fillColor="#EE5622"/>
|
||||
<path
|
||||
android:pathData="M59,46C59,45.448 59.448,45 60,45C60.552,45 61,45.448 61,46L61,53C61,53.552 60.552,54 60,54C59.448,54 59,53.552 59,53L59,46Z"
|
||||
android:fillColor="#EE5622"/>
|
||||
<path
|
||||
android:pathData="M111,29l-0,1l-51,0l-0,-1z"
|
||||
android:strokeAlpha="0.5"
|
||||
android:fillColor="#EE5622"
|
||||
android:fillAlpha="0.5"/>
|
||||
<path
|
||||
android:pathData="M186,85V90H360V80.391C350.31,86.609 339.528,86.146 330,79C319.811,86.642 308.189,86.642 298,79C287.811,86.642 276.189,86.642 266,79C255.811,86.642 244.189,86.642 234,79C223.811,86.642 212.189,86.642 202,79C194,85 186,85 186,85Z"
|
||||
android:strokeAlpha="0.5"
|
||||
android:fillColor="#237BFF"
|
||||
android:fillAlpha="0.5"/>
|
||||
<path
|
||||
android:pathData="M240,23L246,29L252,23L240,23Z"
|
||||
android:fillColor="#EE5622"/>
|
||||
<path
|
||||
android:pathData="M240,90L246,84L252,90H240Z"
|
||||
android:fillColor="#EE5622"/>
|
||||
<path
|
||||
android:pathData="M245,33C245,32.448 245.448,32 246,32C246.552,32 247,32.448 247,33V40C247,40.552 246.552,41 246,41C245.448,41 245,40.552 245,40V33Z"
|
||||
android:fillColor="#EE5622"/>
|
||||
<path
|
||||
android:pathData="M245,59C245,58.448 245.448,58 246,58C246.552,58 247,58.448 247,59L247,66C247,66.552 246.552,67 246,67C245.448,67 245,66.552 245,66L245,59Z"
|
||||
android:fillColor="#EE5622"/>
|
||||
<path
|
||||
android:pathData="M246,71C245.448,71 245,71.448 245,72L245,79C245,79.552 245.448,80 246,80C246.552,80 247,79.552 247,79L247,72C247,71.448 246.552,71 246,71Z"
|
||||
android:fillColor="#EE5622"/>
|
||||
<path
|
||||
android:pathData="M245,46C245,45.448 245.448,45 246,45C246.552,45 247,45.448 247,46L247,53C247,53.552 246.552,54 246,54C245.448,54 245,53.552 245,53L245,46Z"
|
||||
android:fillColor="#EE5622"/>
|
||||
<path
|
||||
android:pathData="M297,29l-0,1l-51,0l-0,-1z"
|
||||
android:strokeAlpha="0.5"
|
||||
android:fillColor="#EE5622"
|
||||
android:fillAlpha="0.5"/>
|
||||
</vector>
|
||||
99
OsmAnd/res/drawable/img_help_vessel_height_night.xml
Normal file
99
OsmAnd/res/drawable/img_help_vessel_height_night.xml
Normal file
|
|
@ -0,0 +1,99 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="360dp"
|
||||
android:height="90dp"
|
||||
android:viewportWidth="360"
|
||||
android:viewportHeight="90">
|
||||
<path
|
||||
android:pathData="M174,0H0V90H174V0Z"
|
||||
android:fillColor="#28292A"/>
|
||||
<path
|
||||
android:pathData="M360,0H186V90H360V0Z"
|
||||
android:fillColor="#28292A"/>
|
||||
<path
|
||||
android:pathData="M0,12V22H2C5.314,22 8,24.686 8,28V90H26V28C26,24.686 28.686,22 32,22H142C145.314,22 148,24.686 148,28V90H166V28C166,24.686 168.686,22 172,22H174V12H0Z"
|
||||
android:fillColor="#4B4C4E"/>
|
||||
<path
|
||||
android:pathData="M224,32L244,12H256L233.801,39.748C232.663,41.172 230.939,42 229.116,42H218C214.686,42 212,44.686 212,48V90H194V48C194,44.686 191.314,42 188,42H186V32H224Z"
|
||||
android:fillColor="#4B4C4E"/>
|
||||
<path
|
||||
android:pathData="M322,32L302,12H290L312.199,39.748C313.337,41.172 315.061,42 316.884,42H328C331.314,42 334,44.686 334,48V90H352V48C352,44.686 354.686,42 358,42H360V32H322Z"
|
||||
android:fillColor="#4B4C4E"/>
|
||||
<path
|
||||
android:pathData="M0,85V90H174V80.391C164.31,86.609 153.528,86.146 144,79C133.811,86.642 122.189,86.642 112,79C101.811,86.642 90.189,86.642 80,79C69.811,86.642 58.189,86.642 48,79C37.811,86.642 26.189,86.642 16,79C8,85 0,85 0,85Z"
|
||||
android:strokeAlpha="0.5"
|
||||
android:fillColor="#237BFF"
|
||||
android:fillAlpha="0.5"/>
|
||||
<path
|
||||
android:pathData="M89,32C89,30.895 88.105,30 87,30C85.895,30 85,30.895 85,32V36H89V32Z"
|
||||
android:fillColor="#237BFF"/>
|
||||
<path
|
||||
android:pathData="M71,44C71,40.686 73.686,38 77,38H97C100.314,38 103,40.686 103,44V54H71V44ZM75,44H85V50H75V44ZM89,44H99V50H89V44Z"
|
||||
android:fillColor="#237BFF"
|
||||
android:fillType="evenOdd"/>
|
||||
<path
|
||||
android:pathData="M63,56V65.8C63,70.492 65.735,74.753 70,76.708L72.863,78.021C70.225,79.295 67.32,80 64,80C57.424,80 52.476,77.233 48,72.757C43.524,77.233 38.576,80 32,80C25.424,80 20.476,77.233 16,72.757C12.574,76.183 9.031,79.268 4.044,80.035C2.148,80.326 0.663,80.211 0,80.125V86.156C1.166,86.253 2.89,86.283 4.956,85.965C8.156,85.473 12.143,84.146 16.038,80.998C20.538,84.398 26.357,86 32,86C37.659,86 43.494,84.389 48,80.969C52.506,84.389 58.341,86 64,86C69.547,86 75.265,84.452 79.732,81.169L81.325,81.899C85.618,84.682 90.881,86 96,86C101.659,86 107.494,84.389 112,80.969C116.506,84.389 122.341,86 128,86C133.659,86 139.494,84.389 144,80.969C148.506,84.389 154.341,86 160,86C164.853,86 169.837,84.815 174,82.32V74.5C170.69,77.81 165.405,80 160,80C153.424,80 148.476,77.233 144,72.757C139.524,77.233 134.576,80 128,80C121.424,80 116.476,77.233 112,72.757C107.72,77.038 103.008,79.755 96.853,79.984L104,76.708C108.265,74.753 111,70.492 111,65.8V56H63ZM79,62V66.5L71,62H79ZM95,62V66.5L103,62H95Z"
|
||||
android:fillColor="#237BFF"
|
||||
android:fillType="evenOdd"/>
|
||||
<path
|
||||
android:pathData="M275,32C275,30.895 274.105,30 273,30C271.895,30 271,30.895 271,32V36H275V32Z"
|
||||
android:fillColor="#237BFF"/>
|
||||
<path
|
||||
android:pathData="M257,44C257,40.686 259.686,38 263,38H283C286.314,38 289,40.686 289,44V54H257V44ZM261,44H271V50H261V44ZM275,44H285V50H275V44Z"
|
||||
android:fillColor="#237BFF"
|
||||
android:fillType="evenOdd"/>
|
||||
<path
|
||||
android:pathData="M249,56V65.8C249,70.492 251.735,74.753 256,76.708L258.863,78.021C256.225,79.295 253.32,80 250,80C243.424,80 238.476,77.233 234,72.757C229.524,77.233 224.576,80 218,80C211.424,80 206.476,77.233 202,72.757C198.574,76.183 195.031,79.268 190.044,80.035C188.148,80.326 186.663,80.211 186,80.125V86.156C187.166,86.253 188.89,86.283 190.956,85.965C194.156,85.473 198.143,84.146 202.038,80.998C206.538,84.398 212.357,86 218,86C223.659,86 229.494,84.389 234,80.969C238.506,84.389 244.341,86 250,86C255.547,86 261.265,84.452 265.732,81.169L267.325,81.899C271.618,84.682 276.881,86 282,86C287.659,86 293.494,84.389 298,80.969C302.506,84.389 308.341,86 314,86C319.659,86 325.494,84.389 330,80.969C334.506,84.389 340.341,86 346,86C350.853,86 355.837,84.815 360,82.32V74.5C356.69,77.81 351.405,80 346,80C339.424,80 334.476,77.233 330,72.757C325.524,77.233 320.576,80 314,80C307.424,80 302.476,77.233 298,72.757C293.72,77.038 289.008,79.755 282.853,79.984L290,76.708C294.265,74.753 297,70.492 297,65.8V56H249ZM265,62V66.5L257,62H265ZM281,62V66.5L289,62H281Z"
|
||||
android:fillColor="#237BFF"
|
||||
android:fillType="evenOdd"/>
|
||||
<path
|
||||
android:pathData="M54,23L60,29L66,23L54,23Z"
|
||||
android:fillColor="#EE5622"/>
|
||||
<path
|
||||
android:pathData="M54,90L60,84L66,90H54Z"
|
||||
android:fillColor="#EE5622"/>
|
||||
<path
|
||||
android:pathData="M59,33C59,32.448 59.448,32 60,32C60.552,32 61,32.448 61,33V40C61,40.552 60.552,41 60,41C59.448,41 59,40.552 59,40V33Z"
|
||||
android:fillColor="#EE5622"/>
|
||||
<path
|
||||
android:pathData="M59,59C59,58.448 59.448,58 60,58C60.552,58 61,58.448 61,59L61,66C61,66.552 60.552,67 60,67C59.448,67 59,66.552 59,66L59,59Z"
|
||||
android:fillColor="#EE5622"/>
|
||||
<path
|
||||
android:pathData="M60,71C59.448,71 59,71.448 59,72L59,79C59,79.552 59.448,80 60,80C60.552,80 61,79.552 61,79L61,72C61,71.448 60.552,71 60,71Z"
|
||||
android:fillColor="#EE5622"/>
|
||||
<path
|
||||
android:pathData="M59,46C59,45.448 59.448,45 60,45C60.552,45 61,45.448 61,46L61,53C61,53.552 60.552,54 60,54C59.448,54 59,53.552 59,53L59,46Z"
|
||||
android:fillColor="#EE5622"/>
|
||||
<path
|
||||
android:pathData="M111,29l-0,1l-51,0l-0,-1z"
|
||||
android:strokeAlpha="0.5"
|
||||
android:fillColor="#EE5622"
|
||||
android:fillAlpha="0.5"/>
|
||||
<path
|
||||
android:pathData="M186,85V90H360V80.391C350.31,86.609 339.528,86.146 330,79C319.811,86.642 308.189,86.642 298,79C287.811,86.642 276.189,86.642 266,79C255.811,86.642 244.189,86.642 234,79C223.811,86.642 212.189,86.642 202,79C194,85 186,85 186,85Z"
|
||||
android:strokeAlpha="0.5"
|
||||
android:fillColor="#237BFF"
|
||||
android:fillAlpha="0.5"/>
|
||||
<path
|
||||
android:pathData="M240,23L246,29L252,23L240,23Z"
|
||||
android:fillColor="#EE5622"/>
|
||||
<path
|
||||
android:pathData="M240,90L246,84L252,90H240Z"
|
||||
android:fillColor="#EE5622"/>
|
||||
<path
|
||||
android:pathData="M245,33C245,32.448 245.448,32 246,32C246.552,32 247,32.448 247,33V40C247,40.552 246.552,41 246,41C245.448,41 245,40.552 245,40V33Z"
|
||||
android:fillColor="#EE5622"/>
|
||||
<path
|
||||
android:pathData="M245,59C245,58.448 245.448,58 246,58C246.552,58 247,58.448 247,59L247,66C247,66.552 246.552,67 246,67C245.448,67 245,66.552 245,66L245,59Z"
|
||||
android:fillColor="#EE5622"/>
|
||||
<path
|
||||
android:pathData="M246,71C245.448,71 245,71.448 245,72L245,79C245,79.552 245.448,80 246,80C246.552,80 247,79.552 247,79L247,72C247,71.448 246.552,71 246,71Z"
|
||||
android:fillColor="#EE5622"/>
|
||||
<path
|
||||
android:pathData="M245,46C245,45.448 245.448,45 246,45C246.552,45 247,45.448 247,46L247,53C247,53.552 246.552,54 246,54C245.448,54 245,53.552 245,53L245,46Z"
|
||||
android:fillColor="#EE5622"/>
|
||||
<path
|
||||
android:pathData="M297,29l-0,1l-51,0l-0,-1z"
|
||||
android:strokeAlpha="0.5"
|
||||
android:fillColor="#EE5622"
|
||||
android:fillAlpha="0.5"/>
|
||||
</vector>
|
||||
|
|
@ -235,7 +235,7 @@ public class TestVoiceActivity extends OsmandActionBarActivity {
|
|||
addButton(ll, "\u25BA (10.3) You have been off the route for 1050m", builder(p).offRoute(1050));
|
||||
addButton(ll, "\u25BA (10.4) You are back on the route", builder(p).backOnRoute());
|
||||
|
||||
addButton(ll, "Voice system info:", builder(p));
|
||||
addButton(ll, "System info and settings:", builder(p));
|
||||
addButton(ll, "\u25BA (11.1) (TAP TO FULLY POPULATE)\n" + getVoiceSystemInfo(), builder(p).attention(""));
|
||||
addButton(ll, "\u25BA (11.2) (TAP TO CHANGE)\n \u25CF Voice prompt delay for selected output: " +
|
||||
((OsmandApplication) getApplication()).getSettings().VOICE_PROMPT_DELAY[((OsmandApplication) getApplication()).getSettings().AUDIO_MANAGER_STREAM.get()].get() +
|
||||
|
|
@ -294,7 +294,7 @@ public class TestVoiceActivity extends OsmandActionBarActivity {
|
|||
public void onClick(View v) {
|
||||
builder.play();
|
||||
if (description.startsWith("\u25BA (11.1)")) {
|
||||
buttonInfo.setText("\u25BA (11.1) Info detected:\n" + getVoiceSystemInfo());
|
||||
buttonInfo.setText("\u25BA (11.1) Voice system info:\n" + getVoiceSystemInfo());
|
||||
// Toast.makeText(TestVoiceActivity.this, "Info refreshed.", Toast.LENGTH_LONG).show();
|
||||
}
|
||||
if (description.startsWith("\u25BA (11.2)")) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue