Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com/osmandapp/Osmand

Browse source
This commit is contained in:
Victor Shcherb 2015-01-13 23:22:18 +01:00
commit 90c912e5ef
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/res/values-gl/phrases.xml
View file

@ -379,4 +379,7 @@
<string name="poi_military_danger_area">Zona perigosa</string> <string name="poi_military_danger_area">Zona perigosa</string>
<string name="poi_military_range">Campo de tiro militar</string> <string name="poi_military_range">Campo de tiro militar</string>
<string name="poi_military_naval_base">Base naval militar</string> <string name="poi_military_naval_base">Base naval militar</string>
<string name="poi_anime_shop">Tenda de anime</string>
<string name="poi_bag_shop">Tenda de bolsos</string>
<string name="poi_hardware_shop">Ferraxería</string>
</resources> </resources>

7
OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java
View file

@ -217,8 +217,8 @@ public class SearchAddressFragment extends SherlockFragment {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
street = null; street = null;
building = null;
street2 = null; street2 = null;
building = null;
searchPoint = null; searchPoint = null;
updateUI(); updateUI();
} }
@ -382,13 +382,13 @@ public class SearchAddressFragment extends SherlockFragment {
} }
protected void updateUI(){ protected void updateUI(){
findViewById(R.id.ResetCountry).setEnabled(!Algorithms.isEmpty(region)); findViewById(R.id.ResetCountry).setEnabled(!Algorithms.isEmpty(region));
if(Algorithms.isEmpty(region)){ if(Algorithms.isEmpty(region)){
countryButton.setText(R.string.ChooseCountry); countryButton.setText(R.string.ChooseCountry);
} else { } else {
countryButton.setText(region.replace('_', ' ')); countryButton.setText(region.replace('_', ' '));
} }
findViewById(R.id.ResetCity).setEnabled(!Algorithms.isEmpty(city) || !Algorithms.isEmpty(postcode)); findViewById(R.id.ResetCity).setEnabled(!Algorithms.isEmpty(city) || !Algorithms.isEmpty(postcode));
if(Algorithms.isEmpty(city) && Algorithms.isEmpty(postcode)){ if(Algorithms.isEmpty(city) && Algorithms.isEmpty(postcode)){
cityButton.setText(R.string.choose_city); cityButton.setText(R.string.choose_city);
@ -400,7 +400,7 @@ public class SearchAddressFragment extends SherlockFragment {
} }
} }
cityButton.setEnabled(!Algorithms.isEmpty(region)); cityButton.setEnabled(!Algorithms.isEmpty(region));
findViewById(R.id.ResetStreet).setEnabled(!Algorithms.isEmpty(street)); findViewById(R.id.ResetStreet).setEnabled(!Algorithms.isEmpty(street));
if(Algorithms.isEmpty(street)){ if(Algorithms.isEmpty(street)){
streetButton.setText(R.string.choose_street); streetButton.setText(R.string.choose_street);
@ -418,7 +418,6 @@ public class SearchAddressFragment extends SherlockFragment {
((RadioButton)findViewById(R.id.RadioIntersStreet)).setChecked(true); ((RadioButton)findViewById(R.id.RadioIntersStreet)).setChecked(true);
} }
updateBuildingSection(); updateBuildingSection();
} }
public void loadData() { public void loadData() {