mozilla-mobile / android-components

⚠️ This project moved to a new repository. It is now developed and maintained at: https://github.com/mozilla-mobile/firefox-android
https://github.com/mozilla-mobile/firefox-android
Mozilla Public License 2.0
2.02k stars 473 forks source link

For #12855 - Upstream the CFRPopup from Fenix to AC to share it in multiple projects (backport #12828) #13015

Closed mergify[bot] closed 2 years ago

mergify[bot] commented 2 years ago

This is an automatic backport of pull request #12828 done by Mergify.

Cherry-pick of 96444ddbd36acf0987ca531574187647bc74b5f3 has failed: ``` On branch mergify/bp/releases/107.0/pr-12828 Your branch is up to date with 'origin/releases/107.0'. You are currently cherry-picking commit 96444ddbd3. (fix conflicts and run "git cherry-pick --continue") (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation) Changes to be committed: modified: .buildconfig.yml new file: components/compose/cfr/README.md new file: components/compose/cfr/build.gradle new file: components/compose/cfr/proguard-rules.pro new file: components/compose/cfr/src/main/AndroidManifest.xml new file: components/compose/cfr/src/main/java/mozilla/components/compose/cfr/CFRPopup.kt new file: components/compose/cfr/src/main/java/mozilla/components/compose/cfr/CFRPopupContent.kt new file: components/compose/cfr/src/main/java/mozilla/components/compose/cfr/CFRPopupFullscreenLayout.kt new file: components/compose/cfr/src/main/java/mozilla/components/compose/cfr/CFRPopupShape.kt new file: components/compose/cfr/src/main/java/mozilla/components/compose/cfr/helper/DisplayOrientationListener.kt new file: components/compose/cfr/src/main/java/mozilla/components/compose/cfr/helper/ViewDetachedListener.kt new file: components/compose/cfr/src/main/res/values/strings.xml new file: components/compose/cfr/src/test/java/mozilla/components/compose/cfr/CFRPopupFullscreenLayoutTest.kt new file: components/compose/cfr/src/test/java/mozilla/components/compose/cfr/helper/DisplayOrientationListenerTest.kt new file: components/compose/cfr/src/test/java/mozilla/components/compose/cfr/helper/ViewDetachedListenerTest.kt new file: components/compose/cfr/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker modified: taskcluster/ci/config.yml Unmerged paths: (use "git add ..." to mark resolution) both modified: buildSrc/src/main/java/Dependencies.kt both modified: docs/changelog.md ``` To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally ---
Mergify commands and options
More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport ` will backport this PR on `` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com