Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
d9b08a32be
2 changed files with 8 additions and 4 deletions
|
@ -131,9 +131,11 @@
|
|||
|
||||
<!-- Map colors, layers, special purpose consistency colors -->
|
||||
<color name="pos_heading">#320000FF</color>
|
||||
<color name="pos_heading_night">#88ff8800</color>
|
||||
<color name="pos_heading_night">#880000FF</color>
|
||||
<!-- color name="pos_heading_night">#88ff8800</color -->
|
||||
<color name="pos_area">#280000FF</color>
|
||||
<color name="pos_area_night">#66ff8800</color>
|
||||
<color name="pos_area_night">#660000FF</color>
|
||||
<!-- color name="pos_area_night">#66ff8800</color -->
|
||||
<color name="pos_around">#707CDC</color> <!-- family blue similar to above -->
|
||||
|
||||
<color name="gpx_track">#B4B319FF</color>
|
||||
|
|
|
@ -237,7 +237,8 @@ public class ApplicationMode {
|
|||
}
|
||||
|
||||
public int getResourceBearingNight() {
|
||||
return bearingIconNight;
|
||||
return bearingIconDay;
|
||||
//return bearingIconNight;
|
||||
}
|
||||
|
||||
public int getResourceLocationDay() {
|
||||
|
@ -245,7 +246,8 @@ public class ApplicationMode {
|
|||
}
|
||||
|
||||
public int getResourceLocationNight() {
|
||||
return locationIconNight;
|
||||
return locationIconDay;
|
||||
//return locationIconNight;
|
||||
}
|
||||
|
||||
public String getStringKey() {
|
||||
|
|
Loading…
Reference in a new issue