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://isaac.ssl.berkeley.edu/boinc-v2

This commit is contained in:
David Anderson 2014-01-05 20:00:28 +00:00
parent dadaa5f034 65bd27c24d
commit 2e602eb04b
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android/BOINC/res/layout/dialog_list_cbitem.xml
View File

@ -20,12 +20,12 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" > android:orientation="vertical"
android:padding="1dp" >
<CheckBox android:layout_width="wrap_content" <CheckBox android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/checkbox" android:id="@+id/checkbox"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/black" android:textColor="@color/black"/>
android:background="@android:color/transparent"/>
</LinearLayout> </LinearLayout>

5
android/BOINC/res/layout/main.xml
View File

@ -93,8 +93,7 @@
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="20dp" android:paddingTop="20dp"
android:paddingBottom="20dp" android:paddingBottom="20dp"
android:background="@drawable/shape_light_blue_background" android:background="@drawable/shape_light_blue_background" >
android:visibility="gone" >
<ProgressBar <ProgressBar
android:id="@+id/loading_progressBar" android:id="@+id/loading_progressBar"
@ -108,7 +107,7 @@
android:id="@+id/loading_header" android:id="@+id/loading_header"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/generic_loading" android:text="@string/status_launching"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:maxWidth="100dp" android:maxWidth="100dp"
android:background="@android:color/transparent" /> android:background="@android:color/transparent" />

7
android/BOINC/src/edu/berkeley/boinc/adapter/PrefsSelectionDialogListAdapter.java
View File

@ -71,12 +71,15 @@ public class PrefsSelectionDialogListAdapter extends ArrayAdapter<SelectionDialo
if(v == null) { if(v == null) {
LayoutInflater li = (LayoutInflater)activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); LayoutInflater li = (LayoutInflater)activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
v = li.inflate(R.layout.dialog_list_cbitem, null); v = li.inflate(R.layout.dialog_list_cbitem, null);
if(getItem(position).highlighted) v.setBackgroundDrawable(activity.getResources().getDrawable(R.drawable.shape_light_red_background));
CheckBox cb = (CheckBox) v.findViewById(R.id.checkbox); CheckBox cb = (CheckBox) v.findViewById(R.id.checkbox);
cb.setChecked(listItem.selected); cb.setChecked(listItem.selected);
cb.setText(listItem.name);
cb.setOnClickListener(this); cb.setOnClickListener(this);
cb.setTag(position); cb.setTag(position);
cb.setText(listItem.name);
if(getItem(position).highlighted) {
v.setBackgroundDrawable(activity.getResources().getDrawable(R.drawable.shape_light_red_background));
cb.setBackgroundColor(activity.getResources().getColor(R.color.light_red));
}
} }
return v; return v;
} }