From 214d6c7123d4b5c9b2b043003c842cb83e7a6c68 Mon Sep 17 00:00:00 2001 From: Joachim Fritzsch Date: Mon, 3 Jun 2013 19:14:32 +0200 Subject: [PATCH 1/2] android: space missing in dialog. --- android/BOINC/src/edu/berkeley/boinc/ProjectsActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/BOINC/src/edu/berkeley/boinc/ProjectsActivity.java b/android/BOINC/src/edu/berkeley/boinc/ProjectsActivity.java index 32f20ef61c..ebe5a79d92 100644 --- a/android/BOINC/src/edu/berkeley/boinc/ProjectsActivity.java +++ b/android/BOINC/src/edu/berkeley/boinc/ProjectsActivity.java @@ -326,12 +326,12 @@ public class ProjectsActivity extends FragmentActivity { if (operation == RpcClient.PROJECT_DETACH) { tvTitle.setText(R.string.projects_confirm_detach_title); tvMessage.setText(getString(R.string.projects_confirm_detach_message) + " " - + project.project_name + getString(R.string.projects_confirm_detach_message2)); + + project.project_name + " " + getString(R.string.projects_confirm_detach_message2)); confirm.setText(R.string.projects_confirm_detach_confirm); } else if(operation == RpcClient.PROJECT_RESET) { tvTitle.setText(R.string.projects_confirm_reset_title); tvMessage.setText(getString(R.string.projects_confirm_reset_message) + " " - + project.project_name + " " + getString(R.string.projects_confirm_reset_message2)); + + project.project_name + getString(R.string.projects_confirm_reset_message2)); confirm.setText(R.string.projects_confirm_reset_confirm); } From e2ef25bc7bf12f7bdee3c90558e537d81df8601c Mon Sep 17 00:00:00 2001 From: Joachim Fritzsch Date: Mon, 3 Jun 2013 19:37:55 +0200 Subject: [PATCH 2/2] android: bug fix ticket #1278, transperancy in project icon --- android/BOINC/res/drawable/shape_blue_border.xml | 1 + .../BOINC/src/edu/berkeley/boinc/client/ClientStatus.java | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/android/BOINC/res/drawable/shape_blue_border.xml b/android/BOINC/res/drawable/shape_blue_border.xml index b474176dbb..f0cd48343c 100644 --- a/android/BOINC/res/drawable/shape_blue_border.xml +++ b/android/BOINC/res/drawable/shape_blue_border.xml @@ -19,4 +19,5 @@ --> + diff --git a/android/BOINC/src/edu/berkeley/boinc/client/ClientStatus.java b/android/BOINC/src/edu/berkeley/boinc/client/ClientStatus.java index 29dd9b4661..a3234b5f07 100644 --- a/android/BOINC/src/edu/berkeley/boinc/client/ClientStatus.java +++ b/android/BOINC/src/edu/berkeley/boinc/client/ClientStatus.java @@ -267,13 +267,10 @@ public class ClientStatus { //Log.d(TAG,"getSlideshowImages() retrieve number file paths: " + filePaths.size()); // load images from paths - BitmapFactory.Options options = new BitmapFactory.Options(); - options.inDither = true; - options.inSampleSize = 1; int x = 0; for (String filePath : filePaths) { if(x >= maxImagesPerProject) continue; - Bitmap tmp = BitmapFactory.decodeFile(filePath, options); + Bitmap tmp = BitmapFactory.decodeFile(filePath); if(tmp!=null) slideshowImages.add(new ImageWrapper(tmp,project.project_name)); else Log.d(TAG,"loadSlideshowImagesFromFile(): null for path: " + filePath); x++; @@ -295,7 +292,6 @@ public class ClientStatus { String iconAbsPath = parseSoftLinkToAbsPath(project.project_dir + "/stat_icon", project.project_dir); if (iconAbsPath == null) return null; //Log.d(TAG, "getProjectIcons() absolute path to icon: " + iconAbsPath); - Bitmap icon = BitmapFactory.decodeFile(iconAbsPath); return icon; }