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

1. Fix some bugs

Browse source 
2. Implement discussable part (currently make invisible)

git-svn-id: https://osmand.googlecode.com/svn/trunk@122 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
This commit is contained in:
Victor Shcherb 2010-06-02 19:36:52 +00:00
parent c1d66edd20
commit fb1eab4c55
4 changed files with 13 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DataExtractionOSM/src/com/osmand/data/preparation/DataExtraction.java
View file

@ -331,7 +331,7 @@ public class DataExtraction {
private void convertEnglishName(MapObject o){ private void convertEnglishName(MapObject o){
String name = o.getName(); String name = o.getName();
if(name != null && o.getEnName() == null){ if(name != null && (o.getEnName() == null || o.getEnName().isEmpty())){
o.setEnName(Junidecode.unidecode(name)); o.setEnName(Junidecode.unidecode(name));
// o.setEnName(transliterator.transliterate(name)); // o.setEnName(transliterator.transliterate(name));
} }

23
OsmAnd/res/layout-port/menu.xml
View file

@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:orientation="vertical" android:layout_width="fill_parent" android:orientation="vertical"
android:layout_height="fill_parent" android:background="@drawable/background" android:layout_height="fill_parent" android:background="@drawable/background">
android:gravity="center">
<TableLayout android:layout_gravity="center" <TableLayout android:layout_gravity="center"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -49,21 +48,13 @@
android:layout_height="70dip" android:layout_height="70dip"
android:drawableLeft="@drawable/settings"/> android:drawableLeft="@drawable/settings"/>
</TableRow> </TableRow>
</TableLayout><!-- </TableLayout>
<FrameLayout android:id="@+id/FrameLayout01" android:layout_gravity="bottom|left"
android:layout_height="wrap_content" android:layout_width="fill_parent">
<Button android:layout_width="wrap_content"
<FrameLayout android:id="@+id/FrameLayout01"
android:layout_height="fill_parent" android:layout_width="fill_parent">
<Button android:layout_width="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginBottom ="5dp" android:layout_marginLeft="5dp" android:layout_marginBottom ="5dp"
android:layout_height="wrap_content" android:layout_gravity="bottom|left" android:layout_height="wrap_content" android:layout_gravity="bottom|left"
android:id="@+id/ExitButton" android:background="@drawable/exit"></Button> android:id="@+id/ExitButton" android:background="@drawable/exit"></Button>
</FrameLayout> </FrameLayout>
</FrameLayout>
--></LinearLayout>

13
OsmAnd/src/com/osmand/activities/MainMenuActivity.java
View file

@ -133,29 +133,24 @@ public class MainMenuActivity extends Activity {
} }
}); });
/*
exitButton = (Button) findViewById(R.id.ExitButton); exitButton = (Button) findViewById(R.id.ExitButton);
exitButton.setVisibility(View.INVISIBLE);
exitButton.setOnClickListener(new OnClickListener() { exitButton.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
finishApplication(); finishApplication();
} }
}); */ });
startApplication(); startApplication();
} }
protected void finishApplication(){ protected void finishApplication(){
mNotificationManager.cancel(APP_NOTIFICATION_ID); mNotificationManager.cancel(APP_NOTIFICATION_ID);
boolean force = false;
ResourceManager.getResourceManager().close(); ResourceManager.getResourceManager().close();
applicationAlreadyStarted = false; applicationAlreadyStarted = false;
if (force) { MainMenuActivity.this.finish();
int pid = android.os.Process.myPid();
android.os.Process.killProcess(pid);
} else {
MainMenuActivity.this.finish();
}
} }
@Override @Override

2
OsmAnd/src/com/osmand/activities/search/SearchByNameAbstractActivity.java
View file

@ -93,7 +93,7 @@ public abstract class SearchByNameAbstractActivity<T> extends ListActivity {
@Override @Override
public void run() { public void run() {
List<T> loadedObjects = getObjects(filter); List<T> loadedObjects = getObjects(filter);
if(!handlerToLoop.hasMessages(1)){ if(handlerToLoop != null && !handlerToLoop.hasMessages(1)){
updateUIList(loadedObjects); updateUIList(loadedObjects);
} }
} }