chrome/android/java/src/org/chromium/chrome/browser/preferences/ManagedPreferenceDelegate.java - Issue 2784663005: Add child account icon to preferences managed by the custodian.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/ManagedPreferenceDelegate.java

Issue 2784663005: Add child account icon to preferences managed by the custodian. (Closed)

Patch Set: x Created 3 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/res/drawable-xxxhdpi/ic_account_child_grey600_36dp.png ('k') | chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/ManagedPreferenceDelegate.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/ManagedPreferenceDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/ManagedPreferenceDelegate.java

index 89650b97a23e9351fa7ba3ad37bef26c54fd9ba6..2773aea69bffedd27810848986d287244e2d0ac2 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/ManagedPreferenceDelegate.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/ManagedPreferenceDelegate.java

@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.preferences;

import android.preference.Preference;

import android.view.View;

+import org.chromium.chrome.R;

import org.chromium.chrome.browser.util.ViewUtils;

/**

@@ -72,6 +73,8 @@ public abstract class ManagedPreferenceDelegate {

public void initPreference(Preference preference) {

if (isPreferenceControlledByPolicy(preference)) {

preference.setIcon(ManagedPreferencesUtils.getManagedByEnterpriseIconId());

+ } else if (isPreferenceControlledByCustodian(preference)) {

+ preference.setIcon(R.drawable.ic_account_child_grey600_36dp);

}

if (isPreferenceClickDisabledByPolicy(preference)) {