Merge pull request #7520 from ashcoding/TIMOB-19798_fix

[TIMOB-19798] Resolving merge conflicts
tidev · Dec 1, 2015 · d9e1e55 · d9e1e55
2 parents 0573f4a + 4959d85
commit d9e1e55
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUICardView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUICardView.java
@@ -432,7 +432,7 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
             }
             paddingTop = (int) radiusTop;
 
-            cardview.setContentPadding(contentPaddingLeft, contentPaddingTop, contentPaddingRight, contentPaddingBottom);
+            cardview.setContentPadding(paddingLeft, paddingTop, paddingRight, paddingBottom);
             cardview.requestLayout();
             if (key.equals(TiC.PROPERTY_CONTENT_PADDING)) {
                 Log.w(TAG, "The contentPadding property is deprecated, use padding instead.");
@@ -444,7 +444,7 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
                 radiusBottom = (float) radiusDimBottom.getPixels(cardview);
             }
             paddingBottom = (int) radiusBottom;
-            cardview.setContentPadding(contentPaddingLeft, contentPaddingTop, contentPaddingRight, contentPaddingBottom);
+            cardview.setContentPadding(paddingLeft, paddingTop, paddingRight, paddingBottom);
             cardview.requestLayout();
             if (key.equals(TiC.PROPERTY_CONTENT_PADDING_BOTTOM)) {
                 Log.w(TAG, "The contentPaddingBottom property is deprecated, use paddingBottom instead.");
@@ -456,7 +456,7 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
                 radiusLeft = (float) radiusDimLeft.getPixels(cardview);
             }
             paddingLeft = (int) radiusLeft;
-            cardview.setContentPadding(contentPaddingLeft, contentPaddingTop, contentPaddingRight, contentPaddingBottom);
+            cardview.setContentPadding(paddingLeft, paddingTop, paddingRight, paddingBottom);
             cardview.requestLayout();
             if (key.equals(TiC.PROPERTY_CONTENT_PADDING_LEFT)) {
                 Log.w(TAG, "The contentPaddingLeft property is deprecated, use paddingLeft instead.");
@@ -468,7 +468,7 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
                 radiusRight = (float) radiusDimRight.getPixels(cardview);
             }
             paddingRight = (int) radiusRight;
-            cardview.setContentPadding(contentPaddingLeft, contentPaddingTop, contentPaddingRight, contentPaddingBottom);
+            cardview.setContentPadding(paddingLeft, paddingTop, paddingRight, paddingBottom);
             cardview.requestLayout();
             if (key.equals(TiC.PROPERTY_CONTENT_PADDING_RIGHT)) {
                 Log.w(TAG, "The contentPaddingRight property is deprecated, use paddingRight instead.");
@@ -480,7 +480,7 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
                 radiusTop = (float) radiusDimTop.getPixels(cardview);
             }
             paddingTop = (int) radiusTop;
-            cardview.setContentPadding(contentPaddingLeft, contentPaddingTop, contentPaddingRight, contentPaddingBottom);
+            cardview.setContentPadding(paddingLeft, paddingTop, paddingRight, paddingBottom);
             cardview.requestLayout();
             if (key.equals(TiC.PROPERTY_CONTENT_PADDING_TOP)) {
                 Log.w(TAG, "The contentPaddingTop property is deprecated, use paddingTop instead.");