From 1f831f5ac810f019b304e6d26c20fa54f8521828 Mon Sep 17 00:00:00 2001
From: "Andrzej J.R. Hunt" <andrzej@ahunt.org>
Date: Fri, 7 Sep 2012 11:43:04 +0200
Subject: Use background color directly rather than Color.TRANSPARENT to
 support 2.3.

It appears that Color.TRANSPARENT turns into black on Android < 4.

Change-Id: I40312062726696777e218afc382d55b48ac6d42b
---
 .../sdremote/src/org/libreoffice/impressremote/PairingActivity.java   | 4 ++--
 .../src/org/libreoffice/impressremote/PresentationFragment.java       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'android')

diff --git a/android/sdremote/src/org/libreoffice/impressremote/PairingActivity.java b/android/sdremote/src/org/libreoffice/impressremote/PairingActivity.java
index 073347382dfc..cb65c5c26ddf 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/PairingActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/PairingActivity.java
@@ -47,8 +47,8 @@ public class PairingActivity extends SherlockActivity {
     }
 
     @Override
-    protected void onPause() {
-        super.onPause();
+    protected void onDestroy() {
+        super.onDestroy();
         unbindService(mConnection);
     }
 
diff --git a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
index 2d5dfacb0243..2304e4332568 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
@@ -295,7 +295,7 @@ public class PresentationFragment extends SherlockFragment {
                             * borderWidth, aBitmap.getHeight() + 2
                             * borderWidth, aBitmap.getConfig());
             Canvas canvas = new Canvas(aOut);
-            canvas.drawColor(Color.TRANSPARENT);
+            canvas.drawColor(getResources().getColor(R.color.light_grey));
             canvas.drawRect(aRect, p);
             canvas.drawBitmap(aBitmap, null, aRect, null);
 
-- 
cgit