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

Remove wrong ellipsis

Browse source
This commit is contained in:
Victor Shcherb 2015-03-09 01:02:28 +01:00
parent 28841bdc21
commit 97e67c8ca6
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/values/strings.xml
View file

@ -60,7 +60,7 @@
<string name="shared_string_remember_my_choice">Remember my choice</string> <string name="shared_string_remember_my_choice">Remember my choice</string>
<string name="shared_string_refresh">Refresh</string> <string name="shared_string_refresh">Refresh</string>
<string name="shared_string_download">Download</string> <string name="shared_string_download">Download</string>
<string name="shared_string_downloading">Downloading…</string> <string name="shared_string_downloading">Downloading</string>
<string name="shared_string_download_successful">Download successful</string> <string name="shared_string_download_successful">Download successful</string>
<string name="shared_string_io_error">I/O error occurred</string> <string name="shared_string_io_error">I/O error occurred</string>
<string name="shared_string_unexpected_error">Unexpected error occurred</string> <string name="shared_string_unexpected_error">Unexpected error occurred</string>

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

@ -126,7 +126,7 @@ public class DownloadTilesDialog {
} }
final ProgressDialog progressDlg = new ProgressDialog(ctx); final ProgressDialog progressDlg = new ProgressDialog(ctx);
progressDlg.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); progressDlg.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
progressDlg.setMessage(ctx.getString(R.string.shared_string_downloading)); progressDlg.setMessage(ctx.getString(R.string.shared_string_downloading) + ctx.getString(R.string.shared_string_ellipsis));
progressDlg.setCancelable(true); progressDlg.setCancelable(true);
progressDlg.setMax(numberTiles); progressDlg.setMax(numberTiles);
progressDlg.setOnCancelListener(new DialogInterface.OnCancelListener(){ progressDlg.setOnCancelListener(new DialogInterface.OnCancelListener(){

8
OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
View file

@ -14,7 +14,6 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import net.osmand.IndexConstants; import net.osmand.IndexConstants;
import net.osmand.PlatformUtil; import net.osmand.PlatformUtil;
import net.osmand.access.AccessibleToast; import net.osmand.access.AccessibleToast;
@ -27,9 +26,8 @@ import net.osmand.plus.download.DownloadFileHelper.DownloadFileShowWarning;
import net.osmand.plus.helpers.DatabaseHelper; import net.osmand.plus.helpers.DatabaseHelper;
import net.osmand.plus.resources.ResourceManager; import net.osmand.plus.resources.ResourceManager;
import net.osmand.util.Algorithms; import net.osmand.util.Algorithms;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import android.annotation.SuppressLint;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.ActivityNotFoundException; import android.content.ActivityNotFoundException;
import android.content.Context; import android.content.Context;
@ -43,6 +41,7 @@ import android.os.StatFs;
import android.view.View; import android.view.View;
import android.widget.Toast; import android.widget.Toast;
@SuppressLint("NewApi")
public class DownloadIndexesThread { public class DownloadIndexesThread {
private BaseDownloadActivity uiActivity = null; private BaseDownloadActivity uiActivity = null;
private IndexFileList indexFiles = null; private IndexFileList indexFiles = null;
@ -193,7 +192,7 @@ public class DownloadIndexesThread {
if (mainView != null) { if (mainView != null) {
mainView.setKeepScreenOn(true); mainView.setKeepScreenOn(true);
} }
startTask(ctx.getString(R.string.shared_string_downloading), -1); startTask(ctx.getString(R.string.shared_string_downloading) + ctx.getString(R.string.shared_string_ellipsis), -1);
} }
} }
@ -483,7 +482,6 @@ public class DownloadIndexesThread {
private <P>void execute(BasicProgressAsyncTask<P, ?, ?> task, P... indexItems) { private <P>void execute(BasicProgressAsyncTask<P, ?, ?> task, P... indexItems) {
if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB ) { if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB ) {
// TODO check
task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, indexItems); task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, indexItems);
} else { } else {
task.execute(indexItems); task.execute(indexItems);