Fix #3574 solution summary xml merged

[MohitGupta121]

Fix Issue : #3574

Essential Checklist

• The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
• Any changes to scripts/assets files have their rationale included in the PR explanation.
• The PR follows the style guide.
• The PR does not contain any unnecessary code changes from Android Studio (reference).
• The PR is made from a branch that's not called "develop" and is up-to-date with "develop".
• The PR is assigned to the appropriate reviewers (reference).

Before mobile-portrait and Landscape:-

After Mobile-Portrait and Landscape:-

Before Tab-Portrait and Landscape:-

After Tab-Portrait and Landscape:-

I'm use online emulator apkonline.net for testing Tablet layout. Because I try with android studio emulator but its too slow and very hang in my laptop that's why.

[MohitGupta121]

@rt4914 bro can u please review my PR, if any changes required I'm ready for that.

[rt4914]

@bkaur-bkj Can you please review this PR first?

[bkaur-bkj]

Issue : #3574

Essential Checklist

• The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
• Any changes to scripts/assets files have their rationale included in the PR explanation.
• The PR follows the style guide.
• The PR does not contain any unnecessary code changes from Android Studio (reference).
• The PR is made from a branch that's not called "develop" and is up-to-date with "develop".
• The PR is assigned to the appropriate reviewers (reference).

Before mobile-portrait and Landscape:-

After Mobile-Portrait and Landscape:-

Before Tab-Portrait and Landscape:-

After Tab-Portrait and Landscape:-

I'm use online emulator apkonline.net for testing Tablet layout. Because I try with android studio emulator but its too slow and very hang in my laptop that's why.

@MohitGupta121 kindly complete the checklist and mark [x] at each point after you have acknowledged that part
also your PR has some merge conflicts due to some recent merged PR so update your branch from develop and resolve them locally and then make a commit again

[bkaur-bkj]

@bkaur-bkj Can you please review this PR first?

yes sir done

[bkaur-bkj]

@MohitGupta121 you need to commit changes only which are done by you not the idea/misc and other such files, pls revert back that changes

[MohitGupta121]

@MohitGupta121 you need to commit changes only which are done by you not the idea/misc and other such files, pls revert back that changes

Okayy, I'll do that

[MohitGupta121]

Issue : #3574

Essential Checklist

• The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
• Any changes to scripts/assets files have their rationale included in the PR explanation.
• The PR follows the style guide.
• The PR does not contain any unnecessary code changes from Android Studio (reference).
• The PR is made from a branch that's not called "develop" and is up-to-date with "develop".
• The PR is assigned to the appropriate reviewers (reference).

Before mobile-portrait and Landscape:-


After Mobile-Portrait and Landscape:-


Before Tab-Portrait and Landscape:-


After Tab-Portrait and Landscape:-


I'm use online emulator apkonline.net for testing Tablet layout. Because I try with android studio emulator but its too slow and very hang in my laptop that's why.

@MohitGupta121 kindly complete the checklist and mark [x] at each point after you have acknowledged that part also your PR has some merge conflicts due to some recent merged PR so update your branch from develop and resolve them locally and then make a commit again

@bkaur-bkj okay I try to resolve the commit but don't know why my local repo not update.
I'll try it again.

[MohitGupta121]

@rt4914 @bkaur-bkj sorry accidentally I click on unassign can you please reassign me.

[bkaur-bkj]

@rt4914 @bkaur-bkj sorry accidentally I click on unassign can you please reassign me.

done

[MohitGupta121]

@rt4914 @bkaur-bkj sorry accidentally I click on unassign can you please reassign me.

done

Yes, thanks

[MohitGupta121]

@MohitGupta121 you need to commit changes only which are done by you not the idea/misc and other such files, pls revert back that changes

@bkaur-bkj or @rt4914 Can you please review it, I resolved all the conflict and commit only my files changes.

[rt4914]

LGTM, thanks. Great work.

[oppiabot]

Unassigning @rt4914 since they have already approved the PR.

[oppiabot]

Assigning @BenHenning for code owner reviews. Thanks!

[MohitGupta121]

@rt4914 Thanks You.
Now can I pick next Issue?

[bkaur-bkj]

@rt4914 Thanks You. Now can I pick next Issue?

Yes by the time the PR gets approved and merged u can request to work on other issue