From bc583bd401884a21b14feec3a728c17ea5e12b07 Mon Sep 17 00:00:00 2001
From: Joachim Fritzsch <joachim.fritzsch@gmail.com>
Date: Sun, 5 Jan 2014 17:26:41 +0100
Subject: [PATCH 1/2] android: fix for UI problem. popup dialog for power
 source preferences had overlapping checkbox and textview on Android API v16.

---
 android/BOINC/res/layout/dialog_list_cbitem.xml            | 6 +++---
 .../boinc/adapter/PrefsSelectionDialogListAdapter.java     | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/android/BOINC/res/layout/dialog_list_cbitem.xml b/android/BOINC/res/layout/dialog_list_cbitem.xml
index 155f13d35b..edc3907a87 100644
--- a/android/BOINC/res/layout/dialog_list_cbitem.xml
+++ b/android/BOINC/res/layout/dialog_list_cbitem.xml
@@ -20,12 +20,12 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    android:padding="1dp" >
         
     <CheckBox android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/checkbox"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="@color/black"
-    	android:background="@android:color/transparent"/>
+        android:textColor="@color/black"/>
 </LinearLayout>
diff --git a/android/BOINC/src/edu/berkeley/boinc/adapter/PrefsSelectionDialogListAdapter.java b/android/BOINC/src/edu/berkeley/boinc/adapter/PrefsSelectionDialogListAdapter.java
index 665ee57199..29466f749b 100644
--- a/android/BOINC/src/edu/berkeley/boinc/adapter/PrefsSelectionDialogListAdapter.java
+++ b/android/BOINC/src/edu/berkeley/boinc/adapter/PrefsSelectionDialogListAdapter.java
@@ -71,12 +71,15 @@ public class PrefsSelectionDialogListAdapter extends ArrayAdapter<SelectionDialo
 		if(v == null) {
 	        LayoutInflater li = (LayoutInflater)activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
     		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);
     		cb.setChecked(listItem.selected);
-    		cb.setText(listItem.name);
     		cb.setOnClickListener(this);
     		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;
 	}

From 42b4283e5858772eeff2ef17c6d323f3b91e986f Mon Sep 17 00:00:00 2001
From: Joachim Fritzsch <joachim.fritzsch@gmail.com>
Date: Sun, 5 Jan 2014 17:36:29 +0100
Subject: [PATCH 2/2] android fix for UI problem. initial layout while loading
 did not show text, i.e. 'starting...'.

---
 android/BOINC/res/layout/main.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/android/BOINC/res/layout/main.xml b/android/BOINC/res/layout/main.xml
index ab0671f66c..0f0b76e6e1 100644
--- a/android/BOINC/res/layout/main.xml
+++ b/android/BOINC/res/layout/main.xml
@@ -93,8 +93,7 @@
 	    android:orientation="horizontal"
 	    android:paddingTop="20dp"
 	    android:paddingBottom="20dp"
-	    android:background="@drawable/shape_light_blue_background"
-	    android:visibility="gone" >
+	    android:background="@drawable/shape_light_blue_background" >
 
 	    <ProgressBar
 	        android:id="@+id/loading_progressBar"
@@ -108,7 +107,7 @@
 	        android:id="@+id/loading_header"
 	        android:layout_width="wrap_content"
 	        android:layout_height="wrap_content"
-	        android:text="@string/generic_loading"
+	        android:text="@string/status_launching"
 	        android:textAppearance="?android:attr/textAppearanceMedium"
 	        android:maxWidth="100dp"
 	        android:background="@android:color/transparent" />