Fix for checkbox padding on platforms where checkbox padding is included in the widget.

Author: ctsims

src/org/odk/collect/android/widgets/SelectMultiWidget.java

@@ -99,7 +99,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
 
                 int padding = (int)Math.floor(context.getResources().getDimension(R.dimen.select_padding));
 
-                c.setPadding(0, 0, padding, 0);
+                c.setPadding(c.getPaddingLeft(), 0, padding, 0);
                 for (int vi = 0; vi < ve.size(); vi++) {
                     // match based on value, not key
                     if (mItems.get(i).getValue().equals(ve.elementAt(vi).getValue())) {

src/org/odk/collect/android/widgets/TriggerWidget.java

@@ -24,7 +24,6 @@
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.CheckBox;
 import android.widget.LinearLayout;
@@ -65,7 +64,7 @@ public TriggerWidget(Context context, FormEntryPrompt prompt, boolean interactiv
         // mActionButton.setPadding(20, 20, 20, 20);
         mTriggerButton.setEnabled(!prompt.isReadOnly());
 
-        mTriggerButton.setPadding(0, padding, 0, padding);
+        mTriggerButton.setPadding(mTriggerButton.getPaddingLeft(), padding, mTriggerButton.getPaddingRight(), padding);
 
         mTriggerButton.setOnClickListener(new View.OnClickListener() {
         	/*