Import mozilla-mobile/firefox-android quarantine. #4
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
…d support for dynamic display actions. X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@d93c285
…e-tabs" component that connects a trabs tray implementation with the session and a toolbar implementation. X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@5ffb861
…ounter X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@eb69899
…tching functionality to system engine X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@687ce3e
…r content description X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@c56df56
…gine-system: Rename strings file. Background: We are going to reserve the name "strings.xml" for translatable strings. This avoids that our L10N tools need to be able to parse and process all kinds of resources that are not strings. X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@ff58c45
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@7228c45
… support for both engines I decided to move the mappings to the respective EngineSession instead of having them in the Engine, since it wasn't possible to have them easily accessible from there via the RequestInterceptor. It made more sense to keep them hidden inside the session as a companion function for easier testing. On the same note, tests have also been included. Added an interceptor the SystemEngine sample app. Cleaned up the styling of the actual error page HTML to make them more mobile friendly. X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@706fe98
…eric crash reporting component (lib-crash). X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@b3d7937
…ization notes to Error Pages X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@62e5ea0
… page string resource namespacing All `error_*` string resources now use `mozac_browser_errorpages_` instead. [ci skip] X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@4b39024
…and tested. We're not specifying a list of locales yet, we're going to add those once we actually localize. X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@12fa577
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@f947622
…ture-download (UI) X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@8b18d2d
…ntextmenu: A component for for displaying context menus when long-pressing web content. X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@b89ebb2
…rt for choice html elements for GeckoEngine X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@9a4aebd
…ng l10n_base in config l10n_base is actually in the way of creating a l10n-only cross-product repo, it turns out. It's not really needed for Android projects anyway, removing it. X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@626027a
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@90b9a25
…rt for alert popup for GeckoEngine. X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@4f8e015
…rt for html input type date for GeckoEngine. X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@837f67c
…rt for alert popup in WebView. X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@b1ab769
…rt for Authentication dialogs. X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@d4ac33d
…port for input type color. X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@d31bb08
…rt for html input datetime-local and time for GeckoEngine. X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@794341e
…rt for text prompts dialogs. X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@c4570b5
… button to custom tabs Also makes the toolbar unclickable so it can't be switching into edit mode, and removes all other actions. Moved the custom tab back button bitmap checking to the feature from the CustomTabConfig since we needed to know the DisplayMetrics for the current screen to properly compare it to the max dp value. X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@be9fd3a
…lt share menu for CustomTabs X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@64aaf72
…pport for pop-up dialog when opening a new window for GeckoEngine. X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@ccc4eb5
…nd in page feature component. X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@89419f2
…ature-sitepermissions component X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@eca8623
…s that support it. X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@a25c2eb
…nter_open_tab_tray_plural. X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@e86a675
…al error page for HTTPS-Only mode. X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@ed60f2e
…ownloads prompt X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@07ea3d8
…t for the Storage Access API prompt X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@faacdef
…a-mobile/android-components#11431) * No issue: add prefix to download feature strings * No issue: add prefix to download feature strings removed extra lines Co-authored-by: mike a <mavduevskiy@gmail.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@3013ed9
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@33ab2dd
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@47c9be3
… notification for BACKGROUND_CHILD process crashes. This adds a processType field to NativeCodeCrash which is read from the GeckoView crash intent. This can have one of the following values: * MAIN: indicating a fatal crash in the main process. * FOREGROUND_CHILD: indicating a crash in a foreground child process (such as a Gecko content process). The application may be able to recover from this. * BACKGROUND_CHILD: indicating a crash in a background child process (such as Gecko's GPU process). The engine will automatically recover from this, and the crash will have barely been noticeable to the user, if at all. The existing isFatal property is now calculated from the processType. It is true for MAIN, and false for others. We treat MAIN crashes as we did fatal crashes before: we do not send the intent to the application, but do show the prompt or notification to the user, if required. We treat FOREGROUND_CHILD crashes as we did non-fatal crashes before: sending the intent to the application if requested. For BACKGROUND_CHILD crashes, we do _not_ send the intent to the application. As the engine automatically recovers there is no need for the application to handle the crash. Additionally, we choose to display the crash notification rather than prompt, as we do not wish to interrupt the user's flow. X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@53d8bcb
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@16690ea
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@f29047e
…eCreditCard dialog to handle saving and updating a credit card X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@eb2d129
…ngs for save credit card dialog X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@1b55b52
…t to display AddressPicker X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@159dc23
…R_BAD_HSTS_CERT error. X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@5628902
…orage access permission instead of "Don't allow" X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@108a370
…he "Select addresses" text to "Select address" X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@758203d
…ose the label tag. This ensures screen readers properly read the entire text. X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@66965f1
…previously deleted version of HSTS string. X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@76b3528
…clearer notification for sending telemetry data X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@1fe873e
…ification will always trigger the crash prompt dialog X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@72616c7
…ge for declarativeNetRequest permission X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@b0a0678
…e common part of search widget in Android Components X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@506de46
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@eb36940
…ep attribute in TimePicker X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@d796655
…isecond separator non-translateable X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@e455651
…nd separator non-translateable X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@c66e5c5
…mposable This upstreams the CFR composable already used on Fenix allowing it to be reused on other projects also. The setup process requires quite a few parameters because as it is highly customizable supporting different indicator orientations or positionings in relation to the anchor and also supporting RTL. X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@6405a45
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7 X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d7 X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8 X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@12e242b
JohanLorenzo
force-pushed
the
firefox-android-quarantine
branch
from
38e0b1a to
adcff2a
Compare
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.
n/t