Commit c07813b3 by Kunj Gupta

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.
parent 24705d5a
...@@ -99,11 +99,6 @@ import butterknife.OnClick; ...@@ -99,11 +99,6 @@ import butterknife.OnClick;
import okhttp3.MediaType; import okhttp3.MediaType;
import okhttp3.RequestBody; 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. * Created by Kunj on 11/8/16.
*/ */
...@@ -358,11 +353,17 @@ public class CatalogueVariableScreen extends AppCompatActivity { ...@@ -358,11 +353,17 @@ public class CatalogueVariableScreen extends AppCompatActivity {
mContainerLayout.addView(nameNullView, childLabelViewLayoutParams); mContainerLayout.addView(nameNullView, childLabelViewLayoutParams);
} else if(viewType == ViewType.CONTAINER_END) { } else if(viewType == ViewType.CONTAINER_END) {
/*In Container End, we need to add view for rendering*/ /*In Container End, we need to add view for rendering*/
LinearLayout containerLinearLayout; LinearLayout popLinearLayout;
if(stack!=null && !stack.isEmpty()) {
popLinearLayout = stack.pop();
if (popLinearLayout != null) {
if(stack!=null && !stack.isEmpty()) { if(stack!=null && !stack.isEmpty()) {
containerLinearLayout = stack.pop(); LinearLayout peekLinearLayout = stack.peek();
if (containerLinearLayout != null) { if (peekLinearLayout != null)
mContainerLayout.addView(containerLinearLayout); peekLinearLayout.addView(popLinearLayout);
} else {
mContainerLayout.addView(popLinearLayout);
}
} }
} }
} else if (viewType != ViewType.MACRO && viewType != ViewType.CONTAINER_SPLIT) { } else if (viewType != ViewType.MACRO && viewType != ViewType.CONTAINER_SPLIT) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment