aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2011-09-20 09:54:43 +0200
committerSamuel Tardieu <sam@rfc1149.net>2011-09-20 09:54:43 +0200
commit6b2f63e0efb3c5a2f09af12455fa86ab347b63f3 (patch)
treeefc5b1a8745fc4d6e244e94d629d393fd0dc2e25
parent9f89e4377459110fe2a5cc558f77df69847354ad (diff)
downloadcgeo-6b2f63e0efb3c5a2f09af12455fa86ab347b63f3.zip
cgeo-6b2f63e0efb3c5a2f09af12455fa86ab347b63f3.tar.gz
cgeo-6b2f63e0efb3c5a2f09af12455fa86ab347b63f3.tar.bz2
Do not use an intermediate AndroidLevel8Internal class
It looks like going through one level of indirection is enough, as the verifier won't work recursively. Tested on Android 1.5 emulator and on SDK API >= 8.
-rw-r--r--main/src/cgeo/geocaching/compatibility/AndroidLevel8.java18
-rw-r--r--main/src/cgeo/geocaching/compatibility/AndroidLevel8Internal.java15
2 files changed, 4 insertions, 29 deletions
diff --git a/main/src/cgeo/geocaching/compatibility/AndroidLevel8.java b/main/src/cgeo/geocaching/compatibility/AndroidLevel8.java
index 1458a6f..637be88 100644
--- a/main/src/cgeo/geocaching/compatibility/AndroidLevel8.java
+++ b/main/src/cgeo/geocaching/compatibility/AndroidLevel8.java
@@ -1,24 +1,14 @@
package cgeo.geocaching.compatibility;
import android.app.Activity;
+import android.view.Display;
public class AndroidLevel8 {
- static {
- try {
- Class.forName("cgeo.geocaching.compatibility.AndroidLevel8Internal");
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
- public static void check() {
- // nothing
- }
- public AndroidLevel8() {
+ public int getRotation(Activity activity) {
+ Display display = activity.getWindowManager().getDefaultDisplay();
+ return display.getRotation();
}
- public int getRotation(Activity activity) {
- return AndroidLevel8Internal.getRotation(activity);
}
}
diff --git a/main/src/cgeo/geocaching/compatibility/AndroidLevel8Internal.java b/main/src/cgeo/geocaching/compatibility/AndroidLevel8Internal.java
deleted file mode 100644
index 45b465b..0000000
--- a/main/src/cgeo/geocaching/compatibility/AndroidLevel8Internal.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package cgeo.geocaching.compatibility;
-
-import android.app.Activity;
-import android.view.Display;
-
-class AndroidLevel8Internal {
-
- public AndroidLevel8Internal() {
- }
-
- public static int getRotation(final Activity activity) {
- Display display = activity.getWindowManager().getDefaultDisplay();
- return display.getRotation();
- }
-}