Merge pull request NativeScript#2128 from NativeScript/android-background-reset

enchev · enchev · commit bd8878842aec · 2016-05-17T17:11:14.000+03:00
android background reset fixed
diff --git a/ui/styling/background.android.ts b/ui/styling/background.android.ts
@@ -241,13 +241,13 @@ export module ad {
         var bkg = <any>nativeView.getBackground();
 
         if (v instanceof button.Button && !types.isNullOrUndefined(bkg) && types.isFunction(bkg.setColorFilter) &&
-            v.borderWidth === 0 && v.borderRadius === 0 &&
+            v.borderWidth === 0 && v.borderRadius === 0 && !clipPathValue &&
             types.isNullOrUndefined(v.style._getValue(style.backgroundImageProperty)) &&
             !types.isNullOrUndefined(v.style._getValue(style.backgroundColorProperty))) {
             let backgroundColor = bkg.backgroundColor = v.style._getValue(style.backgroundColorProperty).android;
             bkg.setColorFilter(backgroundColor, android.graphics.PorterDuff.Mode.SRC_IN);
             bkg.backgroundColor = backgroundColor;
-        } else if (v.borderWidth !== 0 || v.borderRadius !== 0 || !backgroundValue.isEmpty() || !clipPathValue.isEmpty()) {
+        } else if (v.borderWidth !== 0 || v.borderRadius !== 0 || !backgroundValue.isEmpty() || clipPathValue) {
 
             if (!(bkg instanceof BorderDrawableClass)) {
                 bkg = new BorderDrawableClass();
