Merge branch 'master' into develop

Conflicts:
	MaterialDesign/src/com/gc/materialdesign/views/Slider.java

Author: Ivan Navas

MaterialDesign/src/com/gc/materialdesign/views/CheckBox.java

@@ -16,6 +16,7 @@
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 public class CheckBox extends CustomView {
 
@@ -70,20 +71,45 @@ public void run() {
 			});
 
 		checkView = new Check(getContext());
+        checkView.setId(View.generateViewId());
 		RelativeLayout.LayoutParams params = new LayoutParams(Utils.dpToPx(20,
 				getResources()), Utils.dpToPx(20, getResources()));
 		params.addRule(RelativeLayout.CENTER_IN_PARENT, RelativeLayout.TRUE);
 		checkView.setLayoutParams(params);
 		addView(checkView);
 
+        // Adding text view to checkbox
+        int textResource = attrs.getAttributeResourceValue(ANDROIDXML, "text", -1);
+        String text = null;
+
+        if(textResource != -1) {
+            text = getResources().getString(textResource);
+        } else {
+            text = attrs.getAttributeValue(ANDROIDXML, "text");
+        }
+
+        if(text != null) {
+            params.removeRule(RelativeLayout.CENTER_IN_PARENT);
+            params.addRule(RelativeLayout.CENTER_VERTICAL, RelativeLayout.TRUE);
+                    TextView textView = new TextView(getContext());
+            RelativeLayout.LayoutParams textViewLayoutParams = new LayoutParams(LayoutParams.WRAP_CONTENT,
+                    LayoutParams.WRAP_CONTENT);
+            textViewLayoutParams.addRule(RelativeLayout.RIGHT_OF, checkView.getId());
+            textViewLayoutParams.addRule(RelativeLayout.CENTER_VERTICAL, RelativeLayout.TRUE);
+            textViewLayoutParams.setMargins(10, 0, 0, 0);
+            textView.setLayoutParams(textViewLayoutParams);
+            textView.setText(text);
+
+            addView(textView);
+        }
 	}
-	
+
 	@Override
 	public void invalidate() {
 		checkView.invalidate();
 		super.invalidate();
 	}
-	
+
 
 	@Override
 	public boolean onTouchEvent(MotionEvent event) {
@@ -137,7 +163,7 @@ private void changeBackgroundColor(int color) {
 
 	/**
 	 * Make a dark color to press effect
-	 * 
+	 *
 	 * @return
 	 */
 	protected int makePressColor() {

MaterialDesign/src/com/gc/materialdesign/views/ProgressBarIndeterminate.java

@@ -36,10 +36,14 @@ public void onAnimationEnd(Animator arg0) {
 						// Repeat animation
 						ViewHelper.setX(progressView,-progressView.getWidth()/2);
 						cont += suma;
-						ObjectAnimator anim2Repeat = ObjectAnimator.ofFloat(progressView, "x", getWidth());
-						anim2Repeat.setDuration(duration/cont);
-						anim2Repeat.addListener(this);
-						anim2Repeat.start();
+						try {
+							ObjectAnimator anim2Repeat = ObjectAnimator.ofFloat(progressView, "x", getWidth());
+							anim2Repeat.setDuration(duration/cont);
+							anim2Repeat.addListener(this);
+							anim2Repeat.start();
+						} catch (java.lang.ArrayIndexOutOfBoundsException e) {
+							// ignore this error that sometimes comes from the NineOldAndroids 2.4 library
+						}
 						if(cont == 3 || cont == 1) suma *=-1;
 
 					}