Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Android] Updates shields button state on changing toolbar variations (uplift to 1.22.x) #8301

Merged
merged 1 commit into from
Mar 19, 2021

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Mar 18, 2021

Uplift of #8297
Resolves brave/brave-browser#14645

Pre-approval checklist:

  • You have tested your change on Nightly.
  • This contains text which needs to be translated.
    • There are more than 7 days before the release.
    • I've notified folks in #l10n on Slack that translations are needed.
  • The PR milestones match the branch they are landing to.

Pre-merge checklist:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.

Post-merge checklist:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@brave-builds brave-builds requested a review from a team March 18, 2021 23:08
@brave-builds brave-builds self-assigned this Mar 18, 2021
@brave-builds brave-builds added this to the 1.22.x - Release milestone Mar 18, 2021
@samartnik samartnik added CI/skip-ios Do not run CI builds for iOS CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Mar 18, 2021
@kjozwiak
Copy link
Member

post-init failed due to audit_deps as per https://ci.brave.com/job/pr-brave-browser-pr8297_android_shields_button_state_1.22.x-post-init/1/execution/node/144/log/. However, some of those errors have been fixed via #8276.

Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uplift into 1.22.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #8297 (comment).

@kjozwiak kjozwiak merged commit fd00bce into 1.22.x Mar 19, 2021
@kjozwiak kjozwiak deleted the pr8297_android_shields_button_state_1.22.x branch March 19, 2021 06:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants