summaryrefslogtreecommitdiff
path: root/android-project
diff options
context:
space:
mode:
authorSylvain Becker <sylvain.becker@gmail.com>2020-10-01 15:11:28 +0200
committerSylvain Becker <sylvain.becker@gmail.com>2020-10-01 15:11:28 +0200
commit657b03a6fc40a0ea9b867861e208bcfc5854af3e (patch)
tree63b33058765530dcb90e372beb32bee6fd0f668c /android-project
parent117cbcb3f4c24d1048eb8910a5a66e0ecc1d1693 (diff)
downloadsdl-657b03a6fc40a0ea9b867861e208bcfc5854af3e.tar.gz
Android: small change to access to device diagonal value
Diffstat (limited to 'android-project')
-rw-r--r--android-project/app/src/main/java/org/libsdl/app/SDLActivity.java17
1 files changed, 11 insertions, 6 deletions
diff --git a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
index 0c4ec139a..05b83db3d 100644
--- a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
+++ b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
@@ -1031,14 +1031,12 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
return false;
}
- /**
- * This method is called by SDL using JNI.
- */
- public static boolean isTablet() {
+ public static double getDiagonal()
+ {
DisplayMetrics metrics = new DisplayMetrics();
Activity activity = (Activity)getContext();
if (activity == null) {
- return false;
+ return 0.0;
}
activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
@@ -1047,8 +1045,15 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
double dDiagonal = Math.sqrt((dWidthInches * dWidthInches) + (dHeightInches * dHeightInches));
+ return dDiagonal;
+ }
+
+ /**
+ * This method is called by SDL using JNI.
+ */
+ public static boolean isTablet() {
// If our diagonal size is seven inches or greater, we consider ourselves a tablet.
- return (dDiagonal >= 7.0);
+ return (getDiagonal() >= 7.0);
}
/**