Fix #5284: Revert "Fix: #5186: MissingDefaultResource + AppCompatCustomView + FragmentTagUsage" #5287
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BenHenning
approved these changes
Dec 23, 2023
|
Unassigning @BenHenning since they have already approved the PR. |
|
Hi @adhiamboperes, this PR is ready to be merged. Please address any remaining comments prior to merging, and feel free to merge this PR once the CI checks pass and you're happy with it. Thanks! |
BenHenning
deleted the
revert-5191-fix/missingDefaultResource-appCompatCustomView-fragmentTagUsage
branch
BenHenning
pushed a commit
that referenced
this pull request
Dec 23, 2023
6 tasks
BenHenning
added a commit
that referenced
this pull request
Dec 23, 2023
## Explanation This fixes #5284 for the upcoming 0.12 release by cherry-picking #5285 and #5287 into the release branch. Both cherry-picks happened cleanly, so the review is expected to be straightforward. ## 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: ...".)~ - [x] Any changes to [scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets) files have their rationale included in the PR explanation. - [x] The PR follows the [style guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide). - [x] The PR does not contain any unnecessary code changes from Android Studio ([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)). - [x] The PR is made from a branch that's **not** called "develop" and is up-to-date with "develop". - [x] The PR is **assigned** to the appropriate reviewers ([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)). ## For UI-specific PRs only See corresponding cherry-picks and original PRs for references on what reverted behavior is being checked in within this PR. --------- Co-authored-by: Adhiambo Peres <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #5284: Reverts #5191. See issue for details.
This should be a clean revert.