Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://boinc.berkeley.edu/boinc-v2

This commit is contained in:
Rom Walton 2013-06-03 14:25:17 -04:00
parent 816515fa64 54b742838b
commit 348f9eef71
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/BOINC/res/drawable/shape_blue_border.xml
View File

@ -19,4 +19,5 @@
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
<stroke android:width="1dip" android:color="@color/light_blue"/>
<solid android:color="@android:color/transparent"/>
</shape>

4
android/BOINC/src/edu/berkeley/boinc/ProjectsActivity.java
View File

@ -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);
}

6
android/BOINC/src/edu/berkeley/boinc/client/ClientStatus.java
View File

@ -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;
}