Android 13 show Warning modal condition update

[sujitacharya2005]

Resolves brave/brave-browser#27032
Resolves brave/brave-browser#27004
Resolves brave/brave-browser#27108

Submitter Checklist:

• I confirm that no security/privacy review is needed, or that I have requested one
• 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, npm run lint, 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:

• The associated issue milestone is set to the smallest version that the
  changes has landed on
• All relevant documentation has been updated, for instance:
  • https://github.com/brave/brave-browser/wiki/Deviations-from-Chromium-(features-we-disable-or-remove)
  • https://github.com/brave/brave-browser/wiki/Proxy-redirected-URLs
  • https://github.com/brave/brave-browser/wiki/Fingerprinting-Protections
  • https://github.com/brave/brave-browser/wiki/Brave%E2%80%99s-Use-of-Referral-Codes
  • https://github.com/brave/brave-browser/wiki/Custom-Headers
  • https://github.com/brave/brave-browser/wiki/Web-Compatibility-Exceptions-in-Brave
  • https://github.com/brave/brave-browser/wiki/QA-Guide
  • https://github.com/brave/brave-browser/wiki/P3A

Test Plan:

1. Application re-launch 3rd time
2. From Brave setting -> notification click each time

1. If main notification is off, Rewards feature is off, privacy feature is off -> Show Generic Dialog
2. if main notification is off, Rewards feature is on, privacy feature is off -> Show rewards message dialog
3. if main notification if off, Rewards feature is off, privacy feature is on -> show Privacy message dialog
4. if main notification is off, Rewards feature is on, Privacy feature is on -> Show both rewards & privacy message dialog

OnBoarding	Second Header
https://user-images.githubusercontent.com/32419898/206022774-cb715337-ab99-4809-a751-d63588666f8f.mp4	https://user-images.githubusercontent.com/32419898/206021292-7df5f682-798a-4108-8df1-6291a5b58b07.mp4

Light Mode	Dark Mode

[github-actions]

⚠️ PR head is an unsigned commit
commit: b6c5161cdeb9610113e8c5c177cfa9b57ed51962
reason: unsigned
Please follow the handbook to configure commit signing
cc: @sujitacharya2005

[deeppandya]

what was the reason to remove it ?

[sujitacharya2005]

Removed this line, because back key was not working.
If we want to force user to click on close( X mark) then we can have this line.
I feel user this dialog can close if click outside / press on back key.

[deeppandya]

my suggestion would be to disable dismiss on outside click. as we are showing close button on the UI

[sujitacharya2005]

reverted this.
Added back that line
notificationWarningDialog.setCancelable(false);

[deeppandya]

are we sure to check this function after native initialization ?

[sujitacharya2005]

This flow actually starts from BraveActivity::finishNativeInitialization
It's sure that we are calling after native initialization.

[deeppandya]

LGTM

[kjozwiak]

Please only add the milestone once the issue has been resolved/merged into master 👍

[kjozwiak]

Verification PASSED on Pixel 6 running Android 13 using the following build(s):

Brave | 1.49.20 Chromium: 109.0.5414.87 (Official Build) canary (32-bit)
--- | ---
Revision | 2dc18eb511c56e012081b4abc9e38c81c885f7d4-refs/branch-heads/5414@{#1241}
OS | Android 13; Build/T2B1.221118.006

Test Case #1 (Generic Modal/Warning) - Both Rewards & Privacy Report disabled

• launch 1.49.20 Chromium: 109.0.5414.87 and run through onboarding
• tap on Continue via the Brave notifications make it easier modal
  • also ran through this case by tapping on Not now and ensuring notifications weren't being enabled with this method
• tap on Dont Allow via the Allow Brave to send you notifications modal
• go into Settings -> Notifications and notice that Notifications are disabled as expected
• tap on <- (back) to go back into Settings and ensure that you receive a generic warning re: notifications being disabled
• ensured that taping on Not now dismisses the modal without any issues
• ensured that tapping on Continue takes you back into the Notifications screen without an issues
  • ensured that going back into Settings didn't display the generic warning modal re: notifications being disabled
• ensured that once either Not now or Continue has been tapped, the generic warning modal doesn't appear again
  • also ensured that the generic modal doesn't re-appear if the browser was closed while the modal was still opened

Example	Example	Example	Example

Test Case #2 (Generic Modal/Warning) - Rewards enabled & Privacy Report disabled

• launch 1.49.20 Chromium: 109.0.5414.87 and run through onboarding
• tap on Continue via the Brave notifications make it easier modal
• tap on Allow via the Allow Brave to send you notifications modal to enable notifications
• enable rewards via the rewards panel (run through country selection/onboarding)
• once rewards has been enabled, go into Settings -> Notifications
• toggle/disable All Brave - notifications from the Notifications page
• tap on <- (back) to return into Settings and ensure that you don't get any warning modals
• close the Settings page
• go back into Settings -> Notifications
• tap on <- (back) and ensure that you receive a generic warning re: notifications being disabled
• ensured that taping on Not now dismisses the modal without any issues
• ensured that tapping on Continue takes you back into the Notifications screen without an issues
  • ensured that going back into Settings didn't display the generic warning modal re: notifications being disabled
• ensured that once either Not now or Continue has been tapped, the generic warning modal doesn't appear again
  • also ensured that the generic modal doesn't re-appear if the browser was closed while the modal was still opened

Example	Example	Example	Example	Example	Example	Example	Example

Test Case #3 (Generic Modal/Warning) - Rewards disabled & Privacy Report enabled

• launch 1.49.20 Chromium: 109.0.5414.87 and run through onboarding
• tap on Continue via the Brave notifications make it easier modal
• tap on Allow via the Allow Brave to send you notifications modal to enable notifications
• tap on the Brave Stats via NTP and run through the Privacy Report onboarding (ensure you enable Privacy Report)
• visit Settings -> Notifications and toggle/disable All Brave - notifications from the Notifications page
• tap on <- (back) to return into Settings and ensure that you don't get any warning modals
• close the Settings page
• go back into Settings -> Notifications
• tap on <- (back) and ensure that you receive a generic warning re: notifications being disabled
• ensured that taping on Not now dismisses the modal without any issues
• ensured that tapping on Continue takes you back into the Notifications screen without an issues
  • ensured that going back into Settings didn't display the generic warning modal re: notifications being disabled
• ensured that once either Not now or Continue has been tapped, the generic warning modal doesn't appear again
  • also ensured that the generic modal doesn't re-appear if the browser was closed while the modal was still opened
• ensured that there's a banner warning the user that Notifications are disabled within the Privacy Report
  • ensured that tapping on Turn on notifications redirects you to Settings -> Notifications
  • ensured that tapping on <- (back) within Notifications takes you back to the Privacy Report
  • ensured that warning re-appears if the user dismissed via X and then restarted the browser

Example	Example	Example	Example	Example	Example	Example	Example

Test Case #4 (Generic Modal/Warning) - Rewards enabled & Privacy Report enabled

With the following case, basically follow Test Case #2 & Test Case #3 in terms of enabling both features and then disabling All Brave - notifications and ensuring you get a the generic warning modal as per the following:

Example	Example	Example	Example	Example	Example	Example

Test Case #5 (Reward/Warning) - Rewards enabled & Privacy Report disabled

• launch 1.49.20 Chromium: 109.0.5414.87 and run through onboarding
• tap on Continue via the Brave notifications make it easier modal
• tap on Allow via the Allow Brave to send you notifications modal to enable notifications
• enable rewards via the rewards panel (run through country selection/onboarding)
• once rewards has been enabled, go into Settings -> Notifications
• toggle/disable All "Brave Ads" notifications from the Notifications page
• tap on <- (back) to return into Settings and ensure that you get the You're not earning Brave Rewards warning modal
  • ensure that tapping on X or Got it dismiss the modal without any issues
  • ensured that the same modal never appears again when going back from Notifications -> Settings again
• close the Settings page and restart the browser
• ensure that you get the You're not earning Brave Rewards warning modal
• ensured that taping on Not now dismisses the modal without any issues
• ensured that tapping on Turn on Brave notifications takes you to the Settings -> Notifications page within Brave
• ensured that once either Not now or Turn on Brave notifications has been tapped, the warning modal never appears again
  • also ensured that the rewards warning modal doesn't re-appear if the browser was closed while the modal was still opened

Example	Example	Example	Example	Example	Example	Example

Test Case #6 (Privacy Report/Warning) - Rewards disabled & Privacy Report enabled

• launch 1.49.20 Chromium: 109.0.5414.87 and run through onboarding
• tap on Continue via the Brave notifications make it easier modal
• tap on Allow via the Allow Brave to send you notifications modal to enable notifications
• enable Privacy Report by tapping on the Brave Stats and running through onboarding
• once Privacy Report has been enabled, go into Settings -> Notifications
• toggle/disable All "General" notifications from the Notifications page
• tap on <- (back) to return into Settings and ensure that you get the You're not receiving Privacy Reports warning modal
  • ensure that tapping on X or Got it dismiss the modal without any issues
  • ensured that the same modal never appears again when going back from Notifications -> Settings again
• close the Settings page and restart the browser
• ensure that you get the You're not receiving Privacy Reports warning modal
• ensured that taping on Not now dismisses the modal without any issues
• ensured that tapping on Turn on Brave notifications takes you to the Settings -> Notifications page within Brave
• ensured that once either Not now or Turn on Brave notifications has been tapped, the warning modal never appears again
  • also ensured that the privacy report warning modal doesn't re-appear if the browser was closed while the modal was still opened

Example	Example	Example	Example	Example	Example	Example

Test Case #7 (Reward & Privacy Report/Warning) - Rewards enabled & Privacy Report enabled

With the following case, basically follow Test Case #5 & Test Case #6 in terms of enabling both features and then disabling All "Brave Ads" notifications & All "General" notifications and ensuring you get the combined warning modal as per the following:

Example	Example	Example	Example	Example	Example	Example	Example

[kjozwiak]

While running through the above, found the following issues:

• / character appearing within the summary text of the Privacy Report notification warning modal brave-browser#27740
• Turn on Brave notification button not working for both rewards & privacy report notification warning modals brave-browser#27763
• Fix notification modal description and textual button color in dark mode - follow up to #27004 brave-browser#27767