UOFLMA-122 - Fixed: Email>>Service Account>>When we check "Changing Owner ship"…

UOFLMA-122 - Fixed: Email>>Service Account>>When we check "Changing Owner ship" form is displaying on top of check box.

app/src/main/java/com/vsoft/uoflservicenow/ui/CatalogueVariableScreen.java

@@ -99,11 +99,6 @@ import butterknife.OnClick;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
 
-import static com.google.android.gms.analytics.internal.zzy.C;
-import static com.google.android.gms.analytics.internal.zzy.c;
-import static com.google.android.gms.analytics.internal.zzy.n;
-import static com.google.android.gms.analytics.internal.zzy.s;
-
 /**
  * Created by Kunj on 11/8/16.
  */
@@ -358,11 +353,17 @@ public class CatalogueVariableScreen extends AppCompatActivity {
                         mContainerLayout.addView(nameNullView, childLabelViewLayoutParams);
                     } else if(viewType == ViewType.CONTAINER_END) {
                         /*In Container End, we need to add view for rendering*/
-                        LinearLayout containerLinearLayout;
+                        LinearLayout popLinearLayout;
                         if(stack!=null && !stack.isEmpty()) {
-                            containerLinearLayout = stack.pop();
-                            if (containerLinearLayout != null) {
-                                mContainerLayout.addView(containerLinearLayout);
+                            popLinearLayout = stack.pop();
+                            if (popLinearLayout != null) {
+                                if(stack!=null && !stack.isEmpty()) {
+                                    LinearLayout peekLinearLayout = stack.peek();
+                                    if (peekLinearLayout != null)
+                                        peekLinearLayout.addView(popLinearLayout);
+                                } else {
+                                    mContainerLayout.addView(popLinearLayout);
+                                }
                             }
                         }
                     } else if (viewType != ViewType.MACRO && viewType != ViewType.CONTAINER_SPLIT) {