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

Fixed color of switch at Shields and content filters #23910

Merged
merged 1 commit into from
May 30, 2024

Conversation

AlexeyBarabash
Copy link
Contributor

@AlexeyBarabash AlexeyBarabash commented May 30, 2024

This PR fixes color of switch control at shields and content filters after cr126 regression

Must be uplifted along with cr126.

Resolves brave/brave-browser#38687

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

See the issue.

Copy link
Contributor

@tapanmodh tapanmodh left a comment

Choose a reason for hiding this comment

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

lgtm

Copy link
Contributor

@deeppandya deeppandya left a comment

Choose a reason for hiding this comment

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

LGTM

@AlexeyBarabash AlexeyBarabash merged commit f24f36d into master May 30, 2024
20 checks passed
@AlexeyBarabash AlexeyBarabash deleted the android_shields_filter_switch_color branch May 30, 2024 14:10
@github-actions github-actions bot added this to the 1.68.x - Nightly milestone May 30, 2024
emerick pushed a commit that referenced this pull request May 30, 2024
Fixed color of switch at Shields and content filters
kjozwiak pushed a commit that referenced this pull request May 30, 2024
* [CodeHealth] Use span for args on `redirect_cc` (#23698)

This change corrects the build errors when building `redirect_cc` with
`-Wunsafe-buffers-usage`, by introducing a span argument to handle
access to the array of strings in `argv`. The resulting code is more
readable, and also relies on the hardening features available to span.

* Bytecode tests for static methods (#23699)

* Static/regular method is now arg of methodExists
* Removed Brave**** classes from methodExists/classExists tests

* Merge pull request #23233 from brave/cr126

Upgrade from Chromium 125 to Chromium 126

* Fix test_data dependency. (#23841)

* Merge pull request #23862 from brave/search_promotion_layout

Fixed search promotion's layout regression

* Merge pull request #23869 from brave/cr126-followup-fix-share-this-page-icon

Use Brave branded icon for Share this page

* Merge pull request #23868 from brave/cr126-followup-fix-settings-icons

Fix use of upstream icons in brave://settings

* Merge pull request #23871 from brave/cr126-followup-disable-pwa-universal-install

Disable PWA universal install feature flag

* Merge pull request #23874 from brave/cr126-followup-disable-security-privacy-feature-flags

Disable features flagged by privacy/security team

* Upgrade from Chromium 126.0.6478.17 to Chromium 126.0.6478.26 (#23896)

* Update from Chromium 126.0.6478.17 to Chromium 126.0.6478.26.

* Conflict-resolved patches from Chromium 126.0.6478.17 to Chromium 126.0.6478.26.

* Update patches from Chromium 126.0.6478.17 to Chromium 126.0.6478.26.

* Updated strings for Chromium 126.0.6478.26.

* Merge pull request #23897 from brave/android_search_widget_crash

Fixes a crash on search widget on Android

* Merge pull request #23894 from brave/cr126-followup-disable-sync-promo

Disable showing sync promo

* Merge pull request #23902 from brave/cr126-followup-fix-dangerous-downloads-ui

Disable safe_browsing::kImprovedDownloadPageWarnings feature flag

* Merge pull request #23909 from brave/help_bubble_view_button_regressions

Fixed HelpBubbleView's secondary button text is not visible

* Fixed color of switch at Shields and content filters (#23910)

Fixed color of switch at Shields and content filters

---------

Co-authored-by: cdesouza-chromium <cdesouza@brave.com>
Co-authored-by: AlexeyBarabash <AlexeyBarabash@users.noreply.github.com>
Co-authored-by: goodov <5928869+goodov@users.noreply.github.com>
Co-authored-by: Simon Hong <shong@brave.com>
Co-authored-by: Serg <serg.zhukovsky@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Switch toggle disabled state inherits Chrome theme [CR126]
3 participants