Fix style behaviour (#6419)

Co-authored-by: Paul Campbell <paulcam@microsoft.com>

Author: almedina-ms

source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/readonly/ColumnRenderer.java

@@ -165,7 +165,7 @@ public View render(
         ContainerRenderer.applyVerticalContentAlignment(columnLayout, column.GetVerticalContentAlignment());
 
         ContainerRenderer.applyPadding(styleForThis, renderArgs.getContainerStyle(), columnLayout, hostConfig);
-        ContainerRenderer.applyContainerStyle(styleForThis, columnLayout, hostConfig);
+        ContainerRenderer.applyContainerStyle(styleForThis, renderArgs.getContainerStyle(), columnLayout, hostConfig);
         ContainerRenderer.applyBleed(column, columnLayout, context, hostConfig);
         BaseCardElementRenderer.applyRtl(column.GetRtl(), columnLayout);
 

source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/readonly/ColumnSetRenderer.java

@@ -132,7 +132,7 @@ public View render(
         columnSetLayout.setTag(tagContent);
 
         ContainerRenderer.applyPadding(styleForThis, parentContainerStyle, columnSetLayout, hostConfig);
-        ContainerRenderer.applyContainerStyle(styleForThis, columnSetLayout, hostConfig);
+        ContainerRenderer.applyContainerStyle(styleForThis, parentContainerStyle, columnSetLayout, hostConfig);
         ContainerRenderer.applyBleed(columnSet, columnSetLayout, context, hostConfig);
 
         return columnSetLayout;

source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/readonly/ContainerRenderer.java

@@ -86,7 +86,7 @@ public View render(
         ContainerStyle containerStyle = renderArgs.getContainerStyle();
         ContainerStyle styleForThis = getLocalContainerStyle(container, containerStyle);
         applyPadding(styleForThis, containerStyle, containerView, hostConfig);
-        applyContainerStyle(styleForThis, containerView, hostConfig);
+        applyContainerStyle(styleForThis, containerStyle, containerView, hostConfig);
         applyBleed(container, containerView, context, hostConfig);
         BaseCardElementRenderer.applyRtl(container.GetRtl(), containerView);
 
@@ -189,7 +189,7 @@ public static void applyBleed(CollectionTypeElement collectionElement, ViewGroup
     public static void ApplyPadding(ContainerStyle computedContainerStyle, ContainerStyle parentContainerStyle, ViewGroup collectionElementView, HostConfig hostConfig)
     {
         applyPadding(computedContainerStyle, parentContainerStyle, collectionElementView, hostConfig);
-        applyContainerStyle(computedContainerStyle, collectionElementView, hostConfig);
+        applyContainerStyle(computedContainerStyle, parentContainerStyle, collectionElementView, hostConfig);
     }
 
     public static void applyPadding(ContainerStyle computedContainerStyle, ContainerStyle parentContainerStyle, ViewGroup collectionElementView, HostConfig hostConfig)
@@ -206,16 +206,20 @@ public static void applyPadding(ContainerStyle computedContainerStyle, Container
         }
     }
 
-    public static void applyContainerStyle(ContainerStyle computedContainerStyle, ViewGroup collectionElementView, HostConfig hostConfig)
+    public static void applyContainerStyle(ContainerStyle computedContainerStyle, ContainerStyle parentContainerStyle, ViewGroup collectionElementView, HostConfig hostConfig)
     {
-        int color = Color.parseColor(hostConfig.GetBackgroundColor(computedContainerStyle));
-        if (collectionElementView.getBackground() instanceof GradientDrawable)
+        if (computedContainerStyle != parentContainerStyle)
         {
-            ((GradientDrawable) collectionElementView.getBackground()).setColor(color);
-        }
-        else
-        {
-            collectionElementView.setBackgroundColor(color);
+            String backgroundColor = hostConfig.GetBackgroundColor(computedContainerStyle);
+            int color = Color.parseColor(backgroundColor);
+            if (collectionElementView.getBackground() instanceof GradientDrawable)
+            {
+                ((GradientDrawable) collectionElementView.getBackground()).setColor(color);
+            }
+            else
+            {
+                collectionElementView.setBackgroundColor(color);
+            }
         }
     }
 

source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/readonly/TableCellRenderer.kt

@@ -54,7 +54,7 @@ object TableCellRenderer : BaseCardElementRenderer() {
 
         val computedStyle = ContainerRenderer.getLocalContainerStyle(cell, renderArgs.containerStyle)
         ContainerRenderer.applyPadding(computedStyle, renderArgs.containerStyle, cellLayout, hostConfig, renderArgs.table.GetShowGridLines())
-        ContainerRenderer.applyContainerStyle(computedStyle, cellLayout, hostConfig)
+        ContainerRenderer.applyContainerStyle(computedStyle, renderArgs.containerStyle, cellLayout, hostConfig)
         ContainerRenderer.applyVerticalContentAlignment(cellLayout,
                 computeVerticalContentAlignment(cell.GetVerticalContentAlignment(), row, col, renderArgs.table))
         ContainerRenderer.setSelectAction(renderedCard, cell.GetSelectAction(), cellLayout, cardActionHandler, renderArgs)

source/android/adaptivecards/src/main/java/io/adaptivecards/renderer/readonly/TableRenderer.kt

@@ -41,7 +41,7 @@ object TableRenderer : BaseCardElementRenderer() {
                 clipToPadding = false
             }
             val rowStyle = ContainerRenderer.computeContainerStyle(row.GetStyle(), renderArgs.containerStyle)
-            ContainerRenderer.applyContainerStyle(rowStyle, rowLayout, hostConfig)
+            ContainerRenderer.applyContainerStyle(rowStyle, renderArgs.containerStyle, rowLayout, hostConfig)
 
             for (j in table.GetColumns().indices) {
                 val cell = row.GetCells().getOrNull(j) ?: break