Skip to content
This repository has been archived by the owner on Feb 20, 2023. It is now read-only.

For #6063 - ETP blocking info title new strings #6082

Merged

Conversation

BranescuMihai
Copy link
Contributor

Pull Request checklist

  • Quality: This PR builds and passes detekt/ktlint checks (A pre-push hook is recommended)
  • Tests: Only string change, no tests
  • Screenshots: This PR includes screenshots
  • Accessibility: The code in this PR follows accessibility best practices

After merge

  • Milestone: Make sure issues finished by this pull request are added to the milestone of the version currently in development.

To download an APK when reviewing a PR:

  1. click on Show All Checks,
  2. click Details next to "Taskcluster (pull_request)" after it appears and then finishes with a green checkmark,
  3. click on the "Fenix - assemble" task, then click "Run Artifacts".
  4. the APK links should be on the left side of the screen, named for each CPU architecture

Same strings used for ETP preferences and titles for info pages (Strict and Standard)

Menu Standard Strict

@codecov-io
Copy link

codecov-io commented Oct 17, 2019

Codecov Report

Merging #6082 into master will decrease coverage by <.01%.
The diff coverage is 0%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #6082      +/-   ##
============================================
- Coverage     14.29%   14.29%   -0.01%     
  Complexity      324      324              
============================================
  Files           259      259              
  Lines         10700    10702       +2     
  Branches       1560     1559       -1     
============================================
  Hits           1530     1530              
- Misses         9045     9047       +2     
  Partials        125      125
Impacted Files Coverage Δ Complexity Δ
...ngprotection/TrackingProtectionBlockingFragment.kt 0% <0%> (ø) 0 <0> (ø) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4abe229...0344026. Read the comment docs.

Copy link
Contributor

@ekager ekager left a comment

Choose a reason for hiding this comment

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

Looks good! Thank you!

@ekager
Copy link
Contributor

ekager commented Oct 19, 2019

bors r+

bors bot pushed a commit that referenced this pull request Oct 19, 2019
6017: For #6011 - fixed truncated clipboard icon in RTL r=ekager a=cadeyrn

![Screenshot_20191014-234149](https://user-images.githubusercontent.com/1100614/66785457-98c8f280-eedd-11e9-97cc-4de95182d877.png)


6082: For #6063 - ETP blocking info title new strings r=ekager a=BranescuMihai


### Pull Request checklist
<!-- Before submitting the PR, please address each item -->
- [x] **Quality**: This PR builds and passes detekt/ktlint checks (A pre-push hook is recommended)
- [x] **Tests**: Only string change, no tests
- [x] **Screenshots**: This PR includes screenshots
- [x] **Accessibility**: The code in this PR follows [accessibility best practices](https://github.com/mozilla-mobile/shared-docs/blob/master/android/accessibility_guide.md)


### After merge
- [ ] **Milestone**: Make sure issues finished by this pull request are added to the [milestone](https://github.com/mozilla-mobile/fenix/milestones) of the version currently in development.

### To download an APK when reviewing a PR:
1. click on Show All Checks,
2. click Details next to "Taskcluster (pull_request)" after it appears and then finishes with a green checkmark,
3. click on the "Fenix - assemble" task, then click "Run Artifacts".
4. the APK links should be on the left side of the screen, named for each CPU architecture

**Same strings used for ETP preferences and titles for info pages (Strict and Standard)**
<table style="width:100%">
  <tr>
    <th>Menu</th>
    <th>Standard</th> 
    <th>Strict</th>
  </tr>
  <tr>
    <td><img src="https://user-images.githubusercontent.com/1709373/67006748-9689b280-f0ee-11e9-8a08-a9b76ca0d225.png" width="200px" /></td>
    <td><img src="https://user-images.githubusercontent.com/1709373/67006749-9689b280-f0ee-11e9-9fe3-a7b3054f59c9.png" width="200px" /></td>
    <td><img src="https://user-images.githubusercontent.com/1709373/67006750-97224900-f0ee-11e9-82b6-2f9b41cff532.png" width="200px" /></td>
  </tr>
</table>




6125: Don't show fingerprinters section of the standard tracking policy UI 🤞🏻 r=ekager a=starkej2

## Description
Removes the fingerprinters item from the standard tracking policy UI.

Resolves #6108 

## Screenshots / GIFs

Standard Mode              | Strict Mode


Co-authored-by: Sören Hentzschel <kontakt@agenedia.com>
Co-authored-by: Mihai Branescu <branescu.mihai2@gmail.com>
Co-authored-by: Jeffrey Starke <starkej2@gmail.com>
@bors
Copy link

bors bot commented Oct 19, 2019

Timed out (retrying...)

1 similar comment
@bors
Copy link

bors bot commented Oct 19, 2019

Timed out (retrying...)

@ekager ekager added the pr:needs-landing PRs that are ready to land [Will be merged by Mergify] label Oct 19, 2019
@boek boek merged commit e235282 into mozilla-mobile:master Oct 21, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
pr:needs-landing PRs that are ready to land [Will be merged by Mergify]
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants