[Scummvm-cvs-logs] scummvm master -> 0adb9e7d9b5b0045d16c38c750b9253f980d0258

[zeldin]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0adb9e7d9b ANDROID: Reinstate overscan margin resource for OUYA/GoogleTV


Commit: 0adb9e7d9b5b0045d16c38c750b9253f980d0258
    https://github.com/scummvm/scummvm/commit/0adb9e7d9b5b0045d16c38c750b9253f980d0258
Author: Marcus Comstedt (marcus at mc.pp.se)
Date: 2014-07-01T22:14:57+02:00

Commit Message:
ANDROID: Reinstate overscan margin resource for OUYA/GoogleTV

This reverts commits 51cb7557 and 2648062d.

Please note that Android SDK Platform Tools r06 or later is needed
to build ScummVM.

Changed paths:
  A dists/android/res/values-television/margins.xml
  R dists/android/res-ouya/values-television/margins.xml
    backends/platform/android/android.mk



diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 1a40299..69aa9d8 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -26,13 +26,10 @@ PATH_RESOURCES = $(PATH_DIST)/res
 
 PORT_DISTFILES = $(PATH_DIST)/README.Android
 
-# FIXME: OUYA specific.
-#        "values-television" not present in vanilla Android.
-# $(PATH_RESOURCES)/../res-ouya/values-television/margins.xml \
-
 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-ouya/values-television/margins.xml b/dists/android/res-ouya/values-television/margins.xml
deleted file mode 100644
index df586ee..0000000
--- a/dists/android/res-ouya/values-television/margins.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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-television/margins.xml b/dists/android/res/values-television/margins.xml
new file mode 100644
index 0000000..df586ee
--- /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>