Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-07-27 21:33:18 +02:00
commit 61870ed978
3 changed files with 2 additions and 2 deletions

View file

@ -37,7 +37,6 @@ import org.apache.commons.logging.Log;
public class SearchUICore {
private static final int TIMEOUT_BETWEEN_CHARS = 200;
private static final int LIMIT_JUSTIFY_RESULTS = 5;
private static final Log LOG = PlatformUtil.getLog(SearchUICore.class);
private SearchPhrase phrase;
private SearchResultCollection currentSearchResult = new SearchResultCollection();

View file

@ -38,6 +38,8 @@ public class LocationSearchTest {
public void testUTMSearch() throws IOException {
search("17N6734294749123", new LatLon(42.875017, -78.87659050764749));
search("17 N 673429 4749123", new LatLon(42.875017, -78.87659050764749));
search("36N 609752 5064037", new LatLon(45.721184, 34.410328));
}
@Test

View file

@ -15,4 +15,3 @@ dex.force.jumbo=true
android.library.reference.1=../eclipse-compile/appcompat
android.library.reference.2=../eclipse-compile/design
android.library.reference.3=../eclipse-compile/cardview
android.library.reference.4=../eclipse-compile/gridlayout