Skip to content
This repository was archived by the owner on Jun 17, 2024. It is now read-only.

Bug 1876752 - Reordered preferences in SettingsFragment to match the UI layout #5321

Merged
merged 2 commits into from
Jan 29, 2024

Conversation

t-p-white
Copy link
Contributor

@t-p-white t-p-white commented Jan 26, 2024

⚠️ Depends on Bug 1876751 -
Remove redundant preferences from SettingsFragment
being merged first.

No new preferences have been added, this is solely re-arranging the existing preferences to match the UI ordering where applicable.

Pull Request checklist

  • Quality: This PR builds and passes detekt/ktlint checks (A pre-push hook is recommended)
  • Tests: This PR includes thorough tests or an explanation of why it does not
  • Changelog: This PR includes a changelog entry or does not need one
  • Accessibility: The code in this PR follows accessibility best practices or does not include any user facing features

After merge

  • Breaking Changes: If this is a breaking Android Components change, please push a draft PR on Reference Browser to address the breaking issues.

To download an APK when reviewing a PR (after all CI tasks finished running):

  1. Click on Checks at the top of the PR page.
  2. Click on the firefoxci-taskcluster group on the left to expand all tasks.
  3. Click on the build-apk-{fenix,focus,klar}-debug task you're interested in.
  4. Click on View task in Taskcluster in the new DETAILS section.
  5. The APK links should be on the right side of the screen, named for each CPU architecture.

GitHub Automation

https://bugzilla.mozilla.org/show_bug.cgi?id=1876752

Copy link
Contributor

@sarah541 sarah541 left a comment

Choose a reason for hiding this comment

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

Nice!

@@ -42,10 +41,8 @@
<string name="pref_key_override_amo_user" translatable="false">pref_key_override_amo_user</string>
<string name="pref_key_override_amo_collection" translatable="false">pref_key_override_amo_collection</string>
<string name="pref_key_enable_gecko_logs" translatable="false">pref_key_enable_gecko_logs</string>
<string name="pref_key_help" translatable="false">pref_key_help</string>
Copy link
Contributor

Choose a reason for hiding this comment

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

aren't you cleaning these up in #5320?

Copy link
Contributor Author

@t-p-white t-p-white Jan 26, 2024

Choose a reason for hiding this comment

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

@MozillaNoah yep! This PR depends on that issue, which is why it's included as a commit here. I wanted to keep the 2 refactors separate 🙂

Copy link
Contributor

Choose a reason for hiding this comment

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

I really need to have coffee before doing your PRs 😂

Comment on lines 358 to 365
// Only displayed when secret settings are enabled
resources.getString(R.string.pref_key_install_local_addon) -> {
addonFilePicker.launch()
null
}
// Only displayed when secret settings are enabled
Copy link
Member

Choose a reason for hiding this comment

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

Could we also add a new line in-between for these since we did it for everything else? This also needs to happen below so you may need to go through your changes again.

Copy link
Contributor Author

@t-p-white t-p-white Jan 26, 2024

Choose a reason for hiding this comment

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

Good spot, the formatter must've ignored it because of the comments

@gabrielluong gabrielluong added approved PR that has been approved and removed 🕵️‍♀️ needs review PRs that need to be reviewed labels Jan 26, 2024
Copy link
Contributor

mergify bot commented Jan 29, 2024

This pull request has conflicts when rebasing. Could you fix it @t-p-white? 🙏

@t-p-white t-p-white added the 🛬 needs landing PRs that are ready to land label Jan 29, 2024
@mergify mergify bot merged commit 9e4ba92 into mozilla-mobile:main Jan 29, 2024
23 checks passed
@t-p-white t-p-white deleted the 1876752 branch January 31, 2024 10:24
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved PR that has been approved 🛬 needs landing PRs that are ready to land
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants