[Home] Remove time restriction from Chrome Home info promo

This change removes the 60 second time restriction from the info-promo
and adds a shared preference to determine whether it was shown. As to
not conflict with the opt-in/out promo, when that experiment is
disabled, the info preference is set so that promo will not be
presented to the user.

BUG=789685

Change-Id: Iabe72822dd6e51b35427719454b48e1fb7818bd3
Reviewed-on: https://chromium-review.googlesource.com/809344
Commit-Queue: Matthew Jones <mdjones@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523155}

chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java

@@ -68,6 +68,8 @@ public class ChromePreferenceManager {
 
     public static final String CHROME_HOME_SHARED_PREFERENCES_KEY = "chrome_home_enabled_date";
 
+    public static final String CHROME_HOME_INFO_PROMO_SHOWN_KEY = "chrome_home_info_promo_shown";
+
     private static class LazyHolder {
         static final ChromePreferenceManager INSTANCE = new ChromePreferenceManager();
     }
@@ -431,6 +433,20 @@ public class ChromePreferenceManager {
         mSharedPreferences.edit().remove(CHROME_HOME_USER_ENABLED_KEY).apply();
     }
 
+    /**
+     * Set that the Chrome Home info-promo has been shown.
+     */
+    public void setChromeHomeInfoPromoShown() {
+        writeBoolean(CHROME_HOME_INFO_PROMO_SHOWN_KEY, true);
+    }
+
+    /**
+     * @return Whether the info-only version of the Chrome Home promo has been shown.
+     */
+    public boolean hasChromeHomeInfoPromoShown() {
+        return mSharedPreferences.getBoolean(CHROME_HOME_INFO_PROMO_SHOWN_KEY, false);
+    }
+
     /**
      * Mark that the Chrome Home opt-out snackbar has been shown.
      */

chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java

@@ -8,7 +8,6 @@ import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.Build;
@@ -55,8 +54,6 @@ public class FeatureUtilities {
     private static final String ENABLED_EXPERIMENT_GROUP = "Enabled";
     private static final String DISABLED_EXPERIMENT_GROUP = "Disabled";
 
-    private static final long CHROME_HOME_MAX_ENABLED_TIME_MS = 60000; // 60 seconds.
-
     private static Boolean sHasGoogleAccountAuthenticator;
     private static Boolean sHasRecognitionIntentHandler;
     private static Boolean sChromeHomeEnabled;
@@ -288,6 +285,9 @@ public class FeatureUtilities {
 
         if (!ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_HOME_PROMO)
                 && manager.isChromeHomeUserPreferenceSet()) {
+            // If we showed the user the old promo, set the info promo preference so that it is not
+            // presented when the opt-in/out promo is turned off.
+            manager.setChromeHomeInfoPromoShown();
             manager.clearChromeHomeUserPreference();
         }
 
@@ -387,27 +387,25 @@ public class FeatureUtilities {
     public static boolean shouldShowChromeHomePromoForStartup() {
         if (DeviceFormFactor.isTablet()) return false;
 
+        ChromePreferenceManager prefManager = ChromePreferenceManager.getInstance();
+
+        if (!ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_HOME_PROMO_INFO_ONLY)
+                && isChromeHomeEnabled()) {
+            prefManager.setChromeHomeInfoPromoShown();
+        }
+
         // The preference will be set if the promo has been seen before. If that is the case, do not
         // show it again.
-        ChromePreferenceManager prefManager = ChromePreferenceManager.getInstance();
         boolean isChromeHomePrefSet = prefManager.isChromeHomeUserPreferenceSet();
         if (isChromeHomePrefSet) return false;
 
         if (isChromeHomeEnabled()
                 && ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_HOME_PROMO_INFO_ONLY)) {
-            long chromeHomeEnabledDate = System.currentTimeMillis();
-
+            boolean promoShown;
             try (StrictModeContext unused = StrictModeContext.allowDiskReads()) {
-                SharedPreferences sharedPreferences = ContextUtils.getAppSharedPreferences();
-                chromeHomeEnabledDate = sharedPreferences.getLong(
-                        ChromePreferenceManager.CHROME_HOME_SHARED_PREFERENCES_KEY,
-                        chromeHomeEnabledDate);
+                promoShown = ChromePreferenceManager.getInstance().hasChromeHomeInfoPromoShown();
             }
-
-            long timeDeadlineForPromo = chromeHomeEnabledDate + CHROME_HOME_MAX_ENABLED_TIME_MS;
-
-            // If Chrome Home has been enabled for < 60 seconds, show the info dialog.
-            return System.currentTimeMillis() < timeDeadlineForPromo;
+            return !promoShown;
         } else if (!isChromeHomeEnabled()
                 && ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_HOME_PROMO)
                 && ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_HOME_PROMO_ON_STARTUP)) {

chrome/android/java/src/org/chromium/chrome/browser/util/OWNERS

+mdjones@chromium.org
+twellington@chromium.org

chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/ChromeHomePromoDialog.java

@@ -95,6 +95,9 @@ public class ChromeHomePromoDialog extends PromoDialog {
         if (DeviceFormFactor.isTablet()) {
             throw new RuntimeException("Promo should not be shown for tablet devices!");
         }
+        if (ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_HOME_PROMO_INFO_ONLY)) {
+            ChromePreferenceManager.getInstance().setChromeHomeInfoPromoShown();
+        }
         super.show();
     }