Fix compilation problems
This commit is contained in:
Victor Shcherb
parent
ebbdd154b9
commit
764acc6622
5 changed files with 34 additions and 129 deletions
|
|
@ -1,36 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent">
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent" android:orientation="vertical">
|
||||
|
||||
<TextView android:textSize="16sp" android:id="@+id/TextView" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:layout_marginTop="10dp" android:layout_marginBottom="10dp" android:text="@string/navigate_point_top_text"></TextView>
|
||||
|
||||
|
||||
|
||||
<TableLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:stretchColumns="1">
|
||||
<TableRow android:layout_width="fill_parent" >
|
||||
<TextView android:textSize="20sp" android:id="@+id/TextView" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:text="@string/navigate_point_latitude"></TextView>
|
||||
<EditText android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/LatitudeEdit" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:inputType="phone"></EditText>
|
||||
</TableRow>
|
||||
<TableRow android:layout_width="fill_parent" >
|
||||
<TextView android:textSize="20sp" android:id="@+id/TextView" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:text="@string/navigate_point_longitude"></TextView>
|
||||
<EditText android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/LongitudeEdit" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:inputType="phone"></EditText>
|
||||
</TableRow>
|
||||
<RadioGroup android:id="@+id/RadioGroup" android:layout_marginLeft="5dp" android:layout_marginTop="5dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" >
|
||||
<RadioButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/Format1" android:text="@string/navigate_point_format_D"></RadioButton>
|
||||
<RadioButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/Format2" android:text="@string/navigate_point_format_DM"></RadioButton>
|
||||
<RadioButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/Format3" android:text="@string/navigate_point_format_DMS"></RadioButton>
|
||||
</RadioGroup>
|
||||
|
||||
<TextView android:id="@+id/ValidateTextView" android:textSize="16sp" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="" android:gravity="center" android:textColor="@color/color_red"></TextView>
|
||||
|
||||
</TableLayout>
|
||||
|
||||
<LinearLayout android:id="@+id/LinearLayout" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal"
|
||||
android:gravity="center">
|
||||
<Button android:layout_width="125dp" android:layout_height="wrap_content" android:id="@+id/ShowOnMap" android:text="@string/search_shown_on_map"></Button>
|
||||
<Button android:layout_width="125dp" android:layout_height="wrap_content" android:id="@+id/Cancel" android:text="@string/navigate_point_cancel"></Button>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
|
|
@ -8,18 +8,17 @@
|
|||
|
||||
<TableLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:stretchColumns="1">
|
||||
<TableRow android:layout_width="fill_parent" >
|
||||
<TextView android:textSize="20sp" android:id="@+id/TextView" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:text="@string/navigate_point_latitude"></TextView>
|
||||
<TextView android:textSize="20sp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:text="@string/navigate_point_latitude"></TextView>
|
||||
<EditText android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/LatitudeEdit" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:inputType="phone"></EditText>
|
||||
</TableRow>
|
||||
<TableRow android:layout_width="fill_parent" >
|
||||
<TextView android:textSize="20sp" android:id="@+id/TextView" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:text="@string/navigate_point_longitude"></TextView>
|
||||
<TextView android:textSize="20sp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:text="@string/navigate_point_longitude"></TextView>
|
||||
<EditText android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/LongitudeEdit" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:inputType="phone"></EditText>
|
||||
</TableRow>
|
||||
<RadioGroup android:id="@+id/RadioGroup" android:layout_marginLeft="70dp" android:layout_marginTop="5dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical">
|
||||
<RadioButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/Format1" android:text="@string/navigate_point_format_D"></RadioButton>
|
||||
<RadioButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/Format2" android:text="@string/navigate_point_format_DM"></RadioButton>
|
||||
<RadioButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/Format3" android:text="@string/navigate_point_format_DMS"></RadioButton>
|
||||
</RadioGroup>
|
||||
<TableRow android:layout_width="fill_parent" >
|
||||
<TextView android:textSize="20sp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:text="@string/navigate_point_format"></TextView>
|
||||
<Spinner android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/Format" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" ></Spinner>
|
||||
</TableRow>
|
||||
<TextView android:id="@+id/ValidateTextView" android:textSize="16sp" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="" android:gravity="center" android:textColor="@color/color_red"></TextView>
|
||||
</TableLayout>
|
||||
|
||||
|
|
|
|||
|
|
@ -716,19 +716,13 @@
|
|||
<string name="edit_filter_create_message">Se creó el filtro {0}</string>
|
||||
<string name="default_buttons_selectall">Seleccionar todo</string>
|
||||
<string name="offline_navigation_not_available">La navegación offline no está disponible temporalmente.</string>
|
||||
<<<<<<< HEAD
|
||||
<string name="left_side_navigation">Conducción por la izquierda</string>
|
||||
<string name="left_side_navigation_descr">Seleccionar para países con tráfico por la izquierda</string>
|
||||
=======
|
||||
<string name="left_side_navigation">Left-Hand Driving</string>
|
||||
<string name="left_side_navigation_descr">Select for countries with left-hand traffic</string>
|
||||
>>>>>>> new image changes
|
||||
<string name="download_link_and_local_description">Pulsa aquí para descargar o actualizar datos sin conexión.\nPulsa cualquier ítem para ver más detalles, mantén pulsado para desactivar o borrar. Datos actuales en el dispositivo (libre %1$s):</string>
|
||||
<string name="unknown_from_location">La localización de inicio no ha sido determinada</string>
|
||||
<string name="context_menu_item_directions">Directions to here</string>
|
||||
<string name="confirm_interrupt_download">¿Quiere interrumpir la descarga de fichero?</string>
|
||||
<string name="basemap_was_selected_to_download">El MapaBase es necesario para el correcto funcionamiento de la aplicación y ha sido seleccionado para descargar.</string>
|
||||
<<<<<<< HEAD
|
||||
<string name="gpx_index_settings_descr">" (incluye analizador GPX)"</string>
|
||||
<string name="map_online_plugin_is_not_installed">Habilita el plugin de mapas online para seleccionar diferentes fuentes de mapas</string>
|
||||
<string name="map_online_data">Mapas Online</string>
|
||||
|
|
@ -776,55 +770,6 @@
|
|||
<string name="show_ruler_level">Mostrar escala</string>
|
||||
<string name="info_button">Info</string>
|
||||
<string name="back_to_location">Volver a localización</string>
|
||||
=======
|
||||
<string name="gpx_index_settings_descr">" (includes GPX analyzer)"</string>
|
||||
<string name="map_online_plugin_is_not_installed">Habilita el plugin de mapas online para seleccionar diferentes fuentes de mapas</string>
|
||||
<string name="map_online_data">Mapas Online</string>
|
||||
<string name="map_online_data_descr">Use online maps (download and cache tiles on SD card)</string>
|
||||
<string name="online_map_settings">Online Map</string>
|
||||
<string name="online_map_settings_descr">Configure online or cached tile map sources</string>
|
||||
<string name="map_settings">- Map Settings</string>
|
||||
<string name="map_settings_descr">Configure the map display</string>
|
||||
<string name="osmand_rastermaps_plugin_description">This plugin facilitates using a variety of online or cached tile maps as base map or as overlay / underlay maps. The maps can also be prepared offline and copied to the Osmand folder.</string>
|
||||
<string name="osmand_rastermaps_plugin_name">Online Maps</string>
|
||||
<string name="osmand_background_plugin_description">This plugin allows tracking or navigation in power saving (screen off) mode by periodically waking up the GPS device to record a track point or play a voice prompt.</string>
|
||||
<string name="osmand_background_plugin_name">Screen Off Features</string>
|
||||
<string name="osmand_accessibility_description">This plugin configures special accessibility features.</string>
|
||||
<string name="osmand_accessibility_name">Accessibility</string>
|
||||
<string name="extra_settings">Advanced settings</string>
|
||||
<string name="osmand_monitoring_description">This plugin facilitates recording your trips to GPX files or live monitoring using a web service.</string>
|
||||
<string name="osmand_monitoring_name">Tracking + Monitoring</string>
|
||||
<string name="osmand_extra_settings_description">This plugin provides advanced map configuration and some device-specific settings.</string>
|
||||
<string name="osmand_extra_settings_name">Advanced Settings</string>
|
||||
<string name="osmand_development_plugin_description">This plugin enables development and debugging features like animated navigation or rendering performance display.</string>
|
||||
<string name="osmand_development_plugin_name">Osmand Development</string>
|
||||
<string name="plugins_screen">Plugin Manager</string>
|
||||
<string name="select_plugin_to_activate">Touch a Plugin to activate or deactivate it. (Restarting Osmand may be required.)</string>
|
||||
<string name="prefs_plugins_descr">Plugins provide extra functionality bundled within the application like tracking, tile maps, screen off mode, accessibility settings, and others.</string>
|
||||
<string name="prefs_plugins">Plugin Manager</string>
|
||||
<string name="tip_recent_changes_0_8_0_t">"Cambios en 0.8.0 : \n\t- Funcionalidad de plugins \n\t- Soporte para nuevos datos de mapa offline \n\t- Muchos arreglos de fallos "</string>
|
||||
<string name="osm_editing_plugin_description">This plugin facilitates OSM feedback like collecting / modifying OSM POI objects, opening / commenting OSM bugs, and contributing recorded GPX files (requires OSM credentials).</string>
|
||||
<string name="osm_editing_plugin_name">OSM Editing</string>
|
||||
<string name="vector_maps_may_display_faster_on_some_devices">Vector maps likely display faster. May not work well on some devices.</string>
|
||||
<string name="simulate_route_progression_manually">Simulate route progression manually</string>
|
||||
<string name="play_commands_of_currently_selected_voice">Play commands of currently selected voice</string>
|
||||
<string name="debugging_and_development">Osmand debugging and development</string>
|
||||
<string name="native_rendering">Native rendering</string>
|
||||
<string name="animate_routing">Animate navigation</string>
|
||||
<string name="test_voice_prompts">Test voice prompts</string>
|
||||
<string name="tip_recent_changes_0_7_2_t">"Changes in 0.7.2 : \n\t- Native rendering for all devices \n\t- Offline POI editing \n\t- Accessibility \n\t- Lots of bug fixes "</string>
|
||||
<string name="send_files_to_osm">Send GPX files to OSM?</string>
|
||||
<string name="gpx_visibility_txt">Visibility</string>
|
||||
<string name="gpx_tags_txt">Tags</string>
|
||||
<string name="gpx_description_txt">Description</string>
|
||||
<string name="validate_gpx_upload_name_pwd">Please specify OSM user name and password to upload GPX files.</string>
|
||||
<string name="default_buttons_support">Support</string>
|
||||
<string name="support_new_features">Support new features</string>
|
||||
<string name="show_ruler_level_descr">Display ruler on the map</string>
|
||||
<string name="show_ruler_level">Display ruler</string>
|
||||
<string name="info_button">Info</string>
|
||||
<string name="back_to_location">Back to location</string>
|
||||
>>>>>>> new image changes
|
||||
<string name="help">Ayuda</string>
|
||||
<string name="show_details">Mostrar detalles</string>
|
||||
<string name="accessibility_extensions_descr">Accessibility extensions for old Android versions</string>
|
||||
|
|
@ -833,13 +778,8 @@
|
|||
<string name="accessibility_mode_descr">Turns on the accessibility features</string>
|
||||
<string name="accessibility_on">On</string>
|
||||
<string name="accessibility_off">Off</string>
|
||||
<<<<<<< HEAD
|
||||
<string name="accessibility_default">Usar valores de configuración globales del sistema</string>
|
||||
<string name="backToMenu">Volver al Menú</string>
|
||||
=======
|
||||
<string name="accessibility_default">According to the global system setting</string>
|
||||
<string name="backToMenu">Back To Menu</string>
|
||||
>>>>>>> new image changes
|
||||
<string name="zoomOut">Zoom out</string>
|
||||
<string name="zoomIn">Zoom in</string>
|
||||
<string name="zoomIs">Zoom is</string>
|
||||
|
|
@ -861,7 +801,6 @@
|
|||
<string name="north_north_west">nornoroeste</string>
|
||||
<string name="front">Front</string>
|
||||
<string name="front_right">Front right</string>
|
||||
<<<<<<< HEAD
|
||||
<string name="right">Derecha</string>
|
||||
<string name="back_right">Back right</string>
|
||||
<string name="back">Back</string>
|
||||
|
|
@ -869,15 +808,6 @@
|
|||
<string name="left">Izquierda</string>
|
||||
<string name="front_left">Front left</string>
|
||||
<string name="oclock">en punto</string>
|
||||
=======
|
||||
<string name="right">Right</string>
|
||||
<string name="back_right">Back right</string>
|
||||
<string name="back">Back</string>
|
||||
<string name="back_left">Back left</string>
|
||||
<string name="left">Left</string>
|
||||
<string name="front_left">Front left</string>
|
||||
<string name="oclock">o\'clock</string>
|
||||
>>>>>>> new image changes
|
||||
<string name="towards">towards</string>
|
||||
<string name="accuracy">Precisión</string>
|
||||
<string name="altitude">Altitud</string>
|
||||
|
|
@ -890,11 +820,7 @@
|
|||
<string name="auto_announce_off">Stop autoannouncing</string>
|
||||
<string name="scroll_map_by_gestures_descr">Scroll map by gestures on the touchscreen</string>
|
||||
<string name="scroll_map_by_gestures">Natural map scrolling</string>
|
||||
<<<<<<< HEAD
|
||||
<string name="i_am_here">Estoy aquí</string>
|
||||
=======
|
||||
<string name="i_am_here">I am here</string>
|
||||
>>>>>>> new image changes
|
||||
<string name="zoom_by_trackball_descr">Change map zooming by horizontal trackball moves</string>
|
||||
<string name="zoom_by_trackball">Use trackball for zoom control</string>
|
||||
<string name="use_short_object_names_descr">Use short object names in touch exploration mode</string>
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
|
||||
-->
|
||||
<string name="local_index_routing_data">Routing data</string>
|
||||
<string name="navigate_point_format">Format :</string>
|
||||
<string name="poi_search_desc">POI - Point Of interest</string>
|
||||
<string name="address_search_desc">Address search</string>
|
||||
<string name="navpoint_search_desc">Navigate point</string>
|
||||
|
|
@ -925,9 +926,9 @@
|
|||
<string name="navigate_point_top_text">Input latitude & longitude in the selected format (D - degrees, M - minutes, S - seconds)</string>
|
||||
<string name="navigate_point_latitude">Latitude</string>
|
||||
<string name="navigate_point_longitude">Longitude</string>
|
||||
<string name="navigate_point_format_D">DDD.DDDDD</string>
|
||||
<string name="navigate_point_format_DM">DDD MM.MMMMM</string>
|
||||
<string name="navigate_point_format_DMS">DDD MM SS.SSSSS</string>
|
||||
<string name="navigate_point_format_D">DDD.DD</string>
|
||||
<string name="navigate_point_format_DM">DDD MM.MM</string>
|
||||
<string name="navigate_point_format_DMS">DDD MM SS.SS</string>
|
||||
<string name="search_shown_on_map">Show on map</string>
|
||||
<string name="navigate_point_cancel">Cancel</string>
|
||||
<string name="search_address_top_text">Select address</string>
|
||||
|
|
|
|||
|
|
@ -23,9 +23,11 @@ import android.text.Editable;
|
|||
import android.text.TextWatcher;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
import android.widget.AdapterView;
|
||||
import android.widget.AdapterView.OnItemSelectedListener;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.Button;
|
||||
import android.widget.RadioButton;
|
||||
import android.widget.RadioGroup;
|
||||
import android.widget.Spinner;
|
||||
import android.widget.TextView;
|
||||
|
||||
public class NavigatePointActivity extends Activity implements SearchActivityChild {
|
||||
|
|
@ -119,17 +121,26 @@ public class NavigatePointActivity extends Activity implements SearchActivityChi
|
|||
currentFormat = Location.FORMAT_DEGREES;
|
||||
latEdit.setText(convert(latitude, Location.FORMAT_DEGREES));
|
||||
lonEdit.setText(convert(longitude, Location.FORMAT_DEGREES));
|
||||
((RadioButton)findViewById(R.id.Format1)).setChecked(true);
|
||||
((RadioGroup)findViewById(R.id.RadioGroup)).setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener(){
|
||||
final Spinner format = ((Spinner)findViewById(R.id.Format));
|
||||
ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, R.layout.my_spinner_text, new String[] {
|
||||
getString(R.string.navigate_point_format_D),
|
||||
getString(R.string.navigate_point_format_DM),
|
||||
getString(R.string.navigate_point_format_DMS)
|
||||
});
|
||||
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
|
||||
format.setAdapter(adapter);
|
||||
format.setSelection(0);
|
||||
format.setOnItemSelectedListener(new OnItemSelectedListener() {
|
||||
|
||||
@Override
|
||||
public void onCheckedChanged(RadioGroup group, int checkedId) {
|
||||
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
|
||||
int newFormat = currentFormat;
|
||||
if(checkedId == R.id.Format1){
|
||||
String itm = (String) format.getItemAtPosition(position);
|
||||
if(getString(R.string.navigate_point_format_D).equals(itm)){
|
||||
newFormat = Location.FORMAT_DEGREES;
|
||||
} else if(checkedId == R.id.Format2){
|
||||
} else if(getString(R.string.navigate_point_format_DM).equals(itm)){
|
||||
newFormat = Location.FORMAT_MINUTES;
|
||||
} else if(checkedId == R.id.Format3){
|
||||
} else if(getString(R.string.navigate_point_format_DMS).equals(itm)){
|
||||
newFormat = Location.FORMAT_SECONDS;
|
||||
}
|
||||
currentFormat = newFormat;
|
||||
|
|
@ -144,8 +155,12 @@ public class NavigatePointActivity extends Activity implements SearchActivityChi
|
|||
((TextView) findViewById(R.id.ValidateTextView)).setText(R.string.invalid_locations);
|
||||
Log.w(LogUtil.TAG, "Convertion failed", e); //$NON-NLS-1$
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNothingSelected(AdapterView<?> parent) {
|
||||
}
|
||||
});
|
||||
((Button) findViewById(R.id.Cancel)).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
|
|
|
|||
Loading…
Reference in a new issue