[sync] Fix android open-settings promos not showing [chromium/src : main]
Mahmoud Rashad (Gerrit)
Attention is currently required from: Marc Treib.
1 comment:
Patchset:
Hi Marc, PTAL.
To view, visit change 3740569. To unsubscribe, or for help writing mail filters, visit settings.
Marc Treib (Gerrit)
Attention is currently required from: Mahmoud Rashad.
Patch set 1:Code-Review +1
Marc Treib (Gerrit)
Attention is currently required from: Mahmoud Rashad.
1 comment:
Commit Message:
Patch Set #1, Line 10:
without any feature flagsnit: What does this refer to? What feature flags would there be?
To view, visit change 3740569. To unsubscribe, or for help writing mail filters, visit settings.
Mahmoud Rashad (Gerrit)
Attention is currently required from: Marc Treib.
2 comments:
Commit Message:
Patch Set #1, Line 10:
without any feature flagsnit: What does this refer to? What feature flags would there be?
I meant this change is not behind any feature flags, I thinks it's better now.
Patchset:
Thanks!
To view, visit change 3740569. To unsubscribe, or for help writing mail filters, visit settings.
Marc Treib (Gerrit)
Attention is currently required from: Mahmoud Rashad.
Patch set 2:Code-Review +1
1 comment:
Commit Message:
Patch Set #1, Line 10:
without any feature flags
I meant this change is not behind any feature flags, I thinks it's better now.
Ack, thanks!
To view, visit change 3740569. To unsubscribe, or for help writing mail filters, visit settings.
Mahmoud Rashad (Gerrit)
Attention is currently required from: Mahmoud Rashad.
Patch set 2:Commit-Queue +2
Chromium LUCI CQ (Gerrit)
Chromium LUCI CQ submitted this change.
[sync] Fix android open-settings promos not showing
This CL makes sure that android open-settings promos show when no data
is selected to sync.
This change is not behind any feature flags.
Fixed: 1341324
Change-Id: I3f46e0668c328e9735ce19df88ff36dc5941ae3d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3740569
Reviewed-by: Marc Treib <tr...@chromium.org>
Commit-Queue: Mahmoud Rashad <mmra...@google.com>
Cr-Commit-Position: refs/heads/main@{#1021163}
---
M chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
M chrome/android/java/src/org/chromium/chrome/browser/signin/SyncPromoView.java
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
index 7880f29..135f05a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
@@ -187,7 +187,8 @@
SharedPreferencesManager.getInstance().readInt(
ChromePreferenceKeys.SIGNIN_AND_SYNC_PROMO_SHOW_COUNT)
< MAX_SIGNIN_AND_SYNC_PROMO_SHOW_COUNT;
- if (!mSyncService.isSyncRequested() && impressionLimitNotReached) {
+ if ((!mSyncService.isSyncRequested() || mSyncService.getChosenDataTypes().isEmpty())
+ && impressionLimitNotReached) {
return SyncPromoState.PROMO_FOR_SYNC_TURNED_OFF_STATE;
}
return SyncPromoState.NO_PROMO;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SyncPromoView.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SyncPromoView.java
index 87be5f5..5b190c4 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SyncPromoView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SyncPromoView.java
@@ -92,7 +92,8 @@
private void update() {
ViewState viewState;
- if (!SyncService.get().isSyncRequested()) {
+ if (!SyncService.get().isSyncRequested()
+ || SyncService.get().getChosenDataTypes().isEmpty()) {
viewState = getStateForEnableChromeSync();
} else {
viewState = getStateForStartUsing();
To view, visit change 3740569. To unsubscribe, or for help writing mail filters, visit settings.