Add Google Activity Controls preference

chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java

Index: chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java
index 30e3c0f228d560e9b36f4b3921716cf1ce9533c5..ba266bae2b81c78ac3892f06795557bd2edf56fc 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java
@@ -22,6 +22,7 @@ import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
 import android.graphics.Rect;
 import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.UserManager;
@@ -34,7 +35,10 @@ import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Pair;
 
+import org.chromium.base.ApiCompatibilityUtils;
+import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.ChromeApplication;
 import org.chromium.chrome.browser.childaccounts.ChildAccountService;
 import org.chromium.chrome.browser.preferences.ChromeBasePreference;
 import org.chromium.chrome.browser.preferences.ManagedPreferenceDelegate;
@@ -106,6 +110,7 @@ public class AccountManagementFragment extends PreferenceFragment
     public static final String PREF_PARENT_ACCOUNTS = "parent_accounts";
     public static final String PREF_CHILD_CONTENT = "child_content";
     public static final String PREF_CHILD_SAFE_SITES = "child_safe_sites";
+    public static final String PREF_GOOGLE_ACTIVITY_CONTROLS = "google_activity_controls";
     public static final String PREF_SYNC_SETTINGS = "sync_settings";
 
     private int mGaiaServiceType;
@@ -196,6 +201,7 @@ public class AccountManagementFragment extends PreferenceFragment
         configureAddAccountPreference();
         configureChildAccountPreferences();
         configureSyncSettings();
+        configureGoogleActivityControls();
 
         updateAccountsList();
     }
@@ -247,6 +253,13 @@ public class AccountManagementFragment extends PreferenceFragment
 
     private void configureSyncSettings() {
         SyncPreference pref = (SyncPreference) findPreference(PREF_SYNC_SETTINGS);
+        // Sets preference icon and tints it to blue.
+        Drawable icon = ApiCompatibilityUtils.getDrawable(
+                getResources(), R.drawable.permission_background_sync);
+        icon.setColorFilter(
+                ApiCompatibilityUtils.getColor(getResources(), R.color.light_active_color),
+                PorterDuff.Mode.SRC_IN);
+        pref.setIcon(icon);
         final Preferences preferences = (Preferences) getActivity();
         final Account account = ChromeSigninController.get(getActivity()).getSignedInUser();
 
@@ -270,6 +283,22 @@ public class AccountManagementFragment extends PreferenceFragment
         });
     }
 
+    private void configureGoogleActivityControls() {
+        Preference pref = (Preference) findPreference(PREF_GOOGLE_ACTIVITY_CONTROLS);
+        pref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                Activity activity = getActivity();
+                ((ChromeApplication) (activity.getApplicationContext()))
+                        .createGoogleActivityController()
+                        .openWebAndAppActivitySettings(activity,
+                                ChromeSigninController.get(activity).getSignedInAccountName());
+                RecordUserAction.record("Signin_AccountSettings_GoogleActivityControlsClicked");
+                return true;
+            }
+        });
+    }
+
     private void configureAddAccountPreference() {
         ChromeBasePreference addAccount = (ChromeBasePreference) findPreference(PREF_ADD_ACCOUNT);