From 0adb9e7d9b5b0045d16c38c750b9253f980d0258 Mon Sep 17 00:00:00 2001
From: Marcus Comstedt
Date: Tue, 1 Jul 2014 22:14:26 +0200
Subject: 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.
---
 backends/platform/android/android.mk                 | 5 +----
 dists/android/res-ouya/values-television/margins.xml | 5 -----
 dists/android/res/values-television/margins.xml      | 5 +++++
 3 files changed, 6 insertions(+), 9 deletions(-)
 delete mode 100644 dists/android/res-ouya/values-television/margins.xml
 create mode 100644 dists/android/res/values-television/margins.xml

diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 1a40299dcd..69aa9d8303 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 df586eea34..0000000000
--- 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 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>
-- 
cgit v1.2.3