diff options
4 files changed, 22 insertions, 0 deletions
diff --git a/main/src/cgeo/geocaching/activity/AbstractActivity.java b/main/src/cgeo/geocaching/activity/AbstractActivity.java index 0aa7f43..6d6d9dd 100644 --- a/main/src/cgeo/geocaching/activity/AbstractActivity.java +++ b/main/src/cgeo/geocaching/activity/AbstractActivity.java @@ -4,6 +4,7 @@ import cgeo.geocaching.Settings; import cgeo.geocaching.cgBase; import cgeo.geocaching.cgCache; import cgeo.geocaching.cgeoapplication; +import cgeo.geocaching.compatibility.Compatibility; import android.app.Activity; import android.content.Context; @@ -13,6 +14,7 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.view.Menu; import android.view.View; +import android.widget.EditText; public abstract class AbstractActivity extends Activity implements IAbstractActivity { @@ -85,4 +87,7 @@ public abstract class AbstractActivity extends Activity implements IAbstractActi ActivityMixin.addVisitMenu(this, menu, cache); } + protected static void disableSuggestions(final EditText edit) { + Compatibility.disableSuggestions(edit); + } } diff --git a/main/src/cgeo/geocaching/cgeoadvsearch.java b/main/src/cgeo/geocaching/cgeoadvsearch.java index 5fe84c4..90f0402 100644 --- a/main/src/cgeo/geocaching/cgeoadvsearch.java +++ b/main/src/cgeo/geocaching/cgeoadvsearch.java @@ -192,6 +192,7 @@ public class cgeoadvsearch extends AbstractActivity { EditText trackable = (EditText) findViewById(R.id.trackable); trackable.setOnEditorActionListener(new findTrackableAction()); + disableSuggestions(trackable); final Button displayTrackable = (Button) findViewById(R.id.display_trackable); displayTrackable.setOnClickListener(new findTrackableListener()); diff --git a/main/src/cgeo/geocaching/cgeotouch.java b/main/src/cgeo/geocaching/cgeotouch.java index e633730..701c998 100644 --- a/main/src/cgeo/geocaching/cgeotouch.java +++ b/main/src/cgeo/geocaching/cgeotouch.java @@ -293,6 +293,7 @@ public class cgeotouch extends cgLogForm { buttonPost.setEnabled(true); buttonPost.setOnClickListener(new postListener()); } + disableSuggestions((EditText) findViewById(R.id.tracking)); } @Override diff --git a/main/src/cgeo/geocaching/compatibility/Compatibility.java b/main/src/cgeo/geocaching/compatibility/Compatibility.java index ef2f883..c2e6ac4 100644 --- a/main/src/cgeo/geocaching/compatibility/Compatibility.java +++ b/main/src/cgeo/geocaching/compatibility/Compatibility.java @@ -6,9 +6,11 @@ import android.app.Activity; import android.content.res.Configuration; import android.net.Uri; import android.os.Build; +import android.text.InputType; import android.util.Log; import android.view.Display; import android.view.Surface; +import android.widget.EditText; import java.lang.reflect.Method; @@ -16,6 +18,7 @@ public final class Compatibility { private final static int sdkVersion = Integer.parseInt(Build.VERSION.SDK); private final static boolean isLevel8 = sdkVersion >= 8; + private final static boolean isLevel5 = sdkVersion >= 5; private static Method dataChangedMethod = null; private static Method getRotationMethod = null; @@ -79,4 +82,16 @@ public final class Compatibility { } } + public static void disableSuggestions(EditText edit) { + if (isLevel5) { + edit.setInputType(edit.getInputType() + | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS + | InputType.TYPE_TEXT_VARIATION_FILTER); + } + else { + edit.setInputType(edit.getInputType() + | InputType.TYPE_TEXT_VARIATION_FILTER); + } + } + } |