Replay Dark Mode commits #11591
Merged
Replay Dark Mode commits #11591
Conversation
This file contains hidden or 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
…web-preview Issue/10648 material web preview
…id into feature/material-theme # Conflicts: # WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/viewholders/SubfilterListItemViewHolder.kt # WordPress/src/main/res/layout/filtered_list_component.xml
…WordPress-Android into issue/10650-material-me-screen # Conflicts: # WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.java
…WordPress-Android into issue/10649-material-reader-post # Conflicts: # WordPress/src/main/res/values/dimens.xml
…WordPress-Android into issue/10646-material-login-flow # Conflicts: # WordPress/src/main/res/values/styles.xml
…reader-post Issue/10649 material reader post
…WordPress-Android into issue/fix-lifecycle-crash-with-appcompat-1-1-0
…notifications-list Issue/10651 material notifications list and settings
…WordPress-Android into issue/10651-material-notification-details
…id into feature/material-theme # Conflicts: # WordPress/src/main/res/layout/reader_listitem_blog.xml
…WordPress-Android into feature/material-theme
…me-screen Issue/10650 material me screen
…eme-conflicts Issue/fix material theme conflicts
…egrate_release_1.25.0-with-dark-mode
This reverts commit 4585d19.
… replay-dark-mode-commits
|
You can trigger optional UI/connected tests for these changes by visiting CircleCI here. |
|
You can test the changes on this Pull Request by downloading the APK here. |
|
Just to be sure there's no side effect to the 14.6 WPAndroid release, let's only merge this after v14.6 has been cut. |
khaykov
approved these changes
Apr 8, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
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.
This PR "replays" the Dark Mode feature merge trying to have the individual commits be visible in git history.
Looks like the recent merge of the feature (see the 4585d19 commit in #11572) managed to add the feature as a single commit, not correctly attributing the commits to the original authors.
The feature is already merged and no new testing is needed, nor a need to include it to the 14.6 release.
Changes
gutenberg/integrate_release_1.25.0-with-dark-modefrom e9ee593PR submission checklist:
RELEASE-NOTES.txtif necessary.