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

Merge pull request #1374 from Edward17/patch-1

Browse source 
Small refactoring
This commit is contained in:
vshcherb 2015-06-21 17:18:57 +02:00
commit 69c20e5e52
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/build.xml
View file

@ -196,7 +196,7 @@
<replaceregexp file="res/values/no_translate.xml" match='"app_name"&gt;(.*)&lt;' replace='"app_name"&gt;${app.name}&lt;' byline="true" /> <replaceregexp file="res/values/no_translate.xml" match='"app_name"&gt;(.*)&lt;' replace='"app_name"&gt;${app.name}&lt;' byline="true" />
<replaceregexp file="res/layout/search_address.xml" match='xmlns:custom="http://schemas.android.com/apk/res/(.*)"' <replaceregexp file="res/layout/search_address.xml" match='xmlns:custom="http://schemas.android.com/apk/res/(.*)"'
replace='xmlns:custom="http://schemas.android.com/apk/res/${package.name}"' byline="true" /> replace='xmlns:custom="http://schemas.android.com/apk/res/${package.name}"' byline="true" />
<replaceregexp file="res/layout/navigate_point.xml" match='xmlns:custom="http://schemas.android.com/apk/res/(.*)"' <replaceregexp file="res/layout/search_point.xml" match='xmlns:custom="http://schemas.android.com/apk/res/(.*)"'
replace='xmlns:custom="http://schemas.android.com/apk/res/${package.name}"' byline="true" /> replace='xmlns:custom="http://schemas.android.com/apk/res/${package.name}"' byline="true" />
</then> </then>
</if> </if>

2
OsmAnd/res/layout/navigate_point.xml → OsmAnd/res/layout/search_point.xml
View file

@ -152,4 +152,4 @@
</net.osmand.view.ExpandableLinearLayout> </net.osmand.view.ExpandableLinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

2
OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java
View file

@ -59,7 +59,7 @@ public class NavigatePointFragment extends Fragment implements SearchActivityChi
private OsmandApplication app; private OsmandApplication app;
public View onCreateView(android.view.LayoutInflater inflater, android.view.ViewGroup container, Bundle savedInstanceState) { public View onCreateView(android.view.LayoutInflater inflater, android.view.ViewGroup container, Bundle savedInstanceState) {
view = inflater.inflate(R.layout.navigate_point, container, false); view = inflater.inflate(R.layout.search_point, container, false);
setHasOptionsMenu(true); setHasOptionsMenu(true);
location = null; location = null;