merge upstream

1 files changed, 8 insertions, 5 deletions

diff --git a/main/src/cgeo/geocaching/compatibility/Compatibility.java b/main/src/cgeo/geocaching/compatibility/Compatibility.java
index 54e2966..56e18bf 100644
--- a/main/src/cgeo/geocaching/compatibility/Compatibility.java
+++ b/main/src/cgeo/geocaching/compatibility/Compatibility.java
@@ -5,15 +5,18 @@ import org.eclipse.jdt.annotation.NonNull;
 import android.app.Activity;
 import android.graphics.Point;
 import android.os.Build;
+import android.widget.TextView;
 
 public final class Compatibility {
 
     private static final int SDK_VERSION = Build.VERSION.SDK_INT;
 
+    private static final AndroidLevel11Interface LEVEL_11;
     private static final AndroidLevel13Interface LEVEL_13;
     private static final AndroidLevel19Interface LEVEL_19;
 
     static {
+        LEVEL_11 = SDK_VERSION >= 11 ? new AndroidLevel11() : new AndroidLevel11Emulation();
         LEVEL_13 = SDK_VERSION >= 13 ? new AndroidLevel13() : new AndroidLevel13Emulation();
         LEVEL_19 = SDK_VERSION >= 19 ? new AndroidLevel19() : new AndroidLevel19Emulation();
     }
@@ -22,19 +25,19 @@ public final class Compatibility {
         // utility class
     }
 
-    public static int getDisplayWidth() {
-        return LEVEL_13.getDisplayWidth();
-    }
-
     public static Point getDisplaySize() {
         return LEVEL_13.getDisplaySize();
     }
 
-    public static void importGpxFromStorageAccessFramework(final @NonNull Activity activity, int requestCodeImportGpx) {
+    public static void importGpxFromStorageAccessFramework(final @NonNull Activity activity, final int requestCodeImportGpx) {
         LEVEL_19.importGpxFromStorageAccessFramework(activity, requestCodeImportGpx);
     }
 
     public static boolean isStorageAccessFrameworkAvailable() {
         return SDK_VERSION >= 19;
     }
+
+    public static void setTextIsSelectable(final TextView textView, final boolean selectable) {
+        LEVEL_11.setTextIsSelectable(textView, selectable);
+    }
 }