summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorAndrzej J.R. Hunt <andrzej@ahunt.org>2012-09-07 11:43:04 +0200
committerAndrzej J.R. Hunt <andrzej@ahunt.org>2012-09-07 11:44:13 +0200
commit1f831f5ac810f019b304e6d26c20fa54f8521828 (patch)
treefb50ce59cc0f1860860620e36f7e0af0094ea912 /android
parent81f72a3c3a30ef00dfb03bd7fab148d2fcf3e4f8 (diff)
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
Diffstat (limited to 'android')
-rw-r--r--android/sdremote/src/org/libreoffice/impressremote/PairingActivity.java4
-rw-r--r--android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java2
2 files changed, 3 insertions, 3 deletions
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);