| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 package org.chromium.chrome.browser.preferences; | 5 package org.chromium.chrome.browser.preferences; |
| 6 | 6 |
| 7 import android.accounts.Account; | 7 import android.accounts.Account; |
| 8 import android.content.Context; | 8 import android.content.Context; |
| 9 import android.content.res.Resources; | 9 import android.content.res.Resources; |
| 10 import android.graphics.Bitmap; | 10 import android.graphics.Bitmap; |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 } else { | 125 } else { |
| 126 Resources resources = getContext().getResources(); | 126 Resources resources = getContext().getResources(); |
| 127 Bitmap bitmap = AccountManagementFragment.getUserPicture( | 127 Bitmap bitmap = AccountManagementFragment.getUserPicture( |
| 128 signinController.getSignedInAccountName(), resources); | 128 signinController.getSignedInAccountName(), resources); |
| 129 setIcon(new BitmapDrawable(resources, bitmap)); | 129 setIcon(new BitmapDrawable(resources, bitmap)); |
| 130 } | 130 } |
| 131 | 131 |
| 132 setOnPreferenceClickListener(new OnPreferenceClickListener() { | 132 setOnPreferenceClickListener(new OnPreferenceClickListener() { |
| 133 @Override | 133 @Override |
| 134 public boolean onPreferenceClick(Preference preference) { | 134 public boolean onPreferenceClick(Preference preference) { |
| 135 if (ChromeSigninController.get(getContext()).isSignedIn()) retur
n false; | 135 if (!AccountSigninActivity.startIfAllowed( |
| 136 if (!SigninManager.get(getContext()).isSignInAllowed()) { | 136 getContext(), SigninAccessPoint.SETTINGS)) { |
| 137 if (SigninManager.get(getContext()).isSigninDisabledByPolicy
()) { | |
| 138 ManagedPreferencesUtils.showManagedByAdministratorToast(
getContext()); | |
| 139 } | |
| 140 return false; | 137 return false; |
| 141 } | 138 } |
| 142 | 139 |
| 143 setEnabled(false); | 140 setEnabled(false); |
| 144 AccountSigninActivity.startAccountSigninActivity( | |
| 145 getContext(), SigninAccessPoint.SETTINGS); | |
| 146 return true; | 141 return true; |
| 147 } | 142 } |
| 148 }); | 143 }); |
| 149 } | 144 } |
| 150 | 145 |
| 151 private void updateSyncStatusIcon() { | 146 private void updateSyncStatusIcon() { |
| 152 if (SyncPreference.showSyncErrorIcon(getContext())) { | 147 if (SyncPreference.showSyncErrorIcon(getContext())) { |
| 153 setWidgetLayoutResource(R.layout.sync_error_widget); | 148 setWidgetLayoutResource(R.layout.sync_error_widget); |
| 154 } else { | 149 } else { |
| 155 setWidgetLayoutResource(0); | 150 setWidgetLayoutResource(0); |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 AccountManagementFragment.updateUserNamePictureCache(accountId, fullName
, bitmap); | 182 AccountManagementFragment.updateUserNamePictureCache(accountId, fullName
, bitmap); |
| 188 update(); | 183 update(); |
| 189 } | 184 } |
| 190 | 185 |
| 191 // AndroidSyncSettings.AndroidSyncSettingsObserver | 186 // AndroidSyncSettings.AndroidSyncSettingsObserver |
| 192 @Override | 187 @Override |
| 193 public void androidSyncSettingsChanged() { | 188 public void androidSyncSettingsChanged() { |
| 194 update(); | 189 update(); |
| 195 } | 190 } |
| 196 } | 191 } |
| OLD | NEW |