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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2014-04-01 22:02:47 +02:00
commit f7513dc698
7 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/AndroidManifest.xml
View file

@ -4,7 +4,7 @@
<meta-data android:name="com.google.android.backup.api_key" <meta-data android:name="com.google.android.backup.api_key"
android:value="AEdPqrEAAAAIqF3tNGT66etVBn_vgzpfAY1wmIzKV1Ss6Ku-2A" /> android:value="AEdPqrEAAAAIqF3tNGT66etVBn_vgzpfAY1wmIzKV1Ss6Ku-2A" />
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="16"/> <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="19"/>
<uses-feature android:name="android.hardware.camera" android:required="false" /> <uses-feature android:name="android.hardware.camera" android:required="false" />
<uses-feature android:name="android.hardware.microphone" android:required="false"/> <uses-feature android:name="android.hardware.microphone" android:required="false"/>

2
OsmAnd/project.properties
View file

@ -10,5 +10,5 @@
# Indicates whether an apk should be generated for each density. # Indicates whether an apk should be generated for each density.
split.density=false split.density=false
# Project target. # Project target.
target=android-16 target=android-19
android.library.reference.1=../SherlockBar android.library.reference.1=../SherlockBar

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

@ -70,9 +70,9 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct
} }
initUI(loc.getLatitude(), loc.getLongitude()); initUI(loc.getLatitude(), loc.getLongitude());
if(savedInstanceState != null && savedInstanceState.containsKey(SEARCH_LAT) && savedInstanceState.containsKey(SEARCH_LON)) { if(savedInstanceState != null && savedInstanceState.containsKey(SEARCH_LAT) && savedInstanceState.containsKey(SEARCH_LON)) {
String lat = savedInstanceState.getString(SEARCH_LAT, ""); String lat = savedInstanceState.getString(SEARCH_LAT);
String lon = savedInstanceState.getString(SEARCH_LON, ""); String lon = savedInstanceState.getString(SEARCH_LON);
if(lat.length() > 0 && lon.length() > 0) { if(lat != null && lon != null && lat.length() > 0 && lon.length() > 0) {
((Spinner)view.findViewById(R.id.Format)).setSelection(savedInstanceState.getInt(SELECTION, 0)); ((Spinner)view.findViewById(R.id.Format)).setSelection(savedInstanceState.getInt(SELECTION, 0));
currentFormat = savedInstanceState.getInt(SELECTION, 0); currentFormat = savedInstanceState.getInt(SELECTION, 0);
((TextView)view.findViewById(R.id.LatitudeEdit)).setText(lat); ((TextView)view.findViewById(R.id.LatitudeEdit)).setText(lat);

2
SherlockBar/project.properties
View file

@ -9,4 +9,4 @@
android.library=true android.library=true
# Project target. # Project target.
target=android-16 target=android-19

2
plugins/OsmAnd-AddressPlugin/project.properties
View file

@ -11,4 +11,4 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target. # Project target.
target=android-16 target=android-19

2
plugins/Osmand-ParkingPlugin/project.properties
View file

@ -11,4 +11,4 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target. # Project target.
target=android-16 target=android-19

2
plugins/Osmand-SRTMPlugin/project.properties
View file

@ -11,4 +11,4 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target. # Project target.
target=android-16 target=android-19