aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Comstedt2013-08-18 15:21:18 +0200
committerMarcus Comstedt2013-08-18 15:21:18 +0200
commit7a1ffe8c59964a502c0168264f9b2872afb94122 (patch)
tree972bffa5e800d975b04666e431cf61be14f294f1
parentbb39cbcba4a3ca8d16b1589e2d07a4325076b01b (diff)
downloadscummvm-rg350-7a1ffe8c59964a502c0168264f9b2872afb94122.tar.gz
scummvm-rg350-7a1ffe8c59964a502c0168264f9b2872afb94122.tar.bz2
scummvm-rg350-7a1ffe8c59964a502c0168264f9b2872afb94122.zip
ANDROID: Add some margins when screen is a TV
-rw-r--r--backends/platform/android/android.mk2
-rw-r--r--dists/android/res/layout/main.xml4
-rw-r--r--dists/android/res/values-television/margins.xml5
-rw-r--r--dists/android/res/values/margins.xml5
4 files changed, 16 insertions, 0 deletions
diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 34c3a995cb..b0df5e7796 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -27,6 +27,8 @@ PORT_DISTFILES = $(PATH_DIST)/README.Android
RESOURCES = \
$(PATH_RESOURCES)/values/strings.xml \
+ $(PATH_RESOURCES)/values/margins.xml \
+ $(PATH_RESOURCES)/values-television/margins.xml \
$(PATH_RESOURCES)/layout/main.xml \
$(PATH_RESOURCES)/layout/splash.xml \
$(PATH_RESOURCES)/drawable/gradient.xml \
diff --git a/dists/android/res/layout/main.xml b/dists/android/res/layout/main.xml
index 8b0d515d62..31aa345cc7 100644
--- a/dists/android/res/layout/main.xml
+++ b/dists/android/res/layout/main.xml
@@ -9,4 +9,8 @@
android:keepScreenOn="true"
android:focusable="true"
android:focusableInTouchMode="true"
+ android:layout_marginTop="@dimen/verticalMargin"
+ android:layout_marginLeft="@dimen/horizontalMargin"
+ android:layout_marginBottom="@dimen/verticalMargin"
+ android:layout_marginRight="@dimen/horizontalMargin"
/>
diff --git a/dists/android/res/values-television/margins.xml b/dists/android/res/values-television/margins.xml
new file mode 100644
index 0000000000..df586eea34
--- /dev/null
+++ b/dists/android/res/values-television/margins.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <dimen name="verticalMargin">45px</dimen>
+ <dimen name="horizontalMargin">80px</dimen>
+</resources>
diff --git a/dists/android/res/values/margins.xml b/dists/android/res/values/margins.xml
new file mode 100644
index 0000000000..a865687b3a
--- /dev/null
+++ b/dists/android/res/values/margins.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <dimen name="verticalMargin">0px</dimen>
+ <dimen name="horizontalMargin">0px</dimen>
+</resources>