mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 23:28:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge bda4d84fa2 into b18f6b394c

Browse source
This commit is contained in:
Andy Scherzinger 2017-08-21 06:56:43 +00:00 committed by GitHub
commit 9798550cc8
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/lint/lint-results.txt
View file

@ -1,2 +1,2 @@
DO NOT TOUCH; GENERATED BY DRONE DO NOT TOUCH; GENERATED BY DRONE
<span class="mdl-layout-title">Lint Report: 1 error and 563 warnings</span> <span class="mdl-layout-title">Lint Report: 1 error and 525 warnings</span>

2
src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java
View file

@ -312,7 +312,7 @@ public class UserInfoActivity extends FileActivity {
DisplayUtils.setAvatar(account, UserInfoActivity.this, DisplayUtils.setAvatar(account, UserInfoActivity.this,
mCurrentAccountAvatarRadiusDimension, getResources(), getStorageManager(), avatar); mCurrentAccountAvatarRadiusDimension, getResources(), getStorageManager(), avatar);
int tint = Color.parseColor(getStorageManager().getCapability(account.name).getServerColor()); int tint = ThemeUtils.primaryColor(account);
if (userInfo != null) { if (userInfo != null) {
if (!TextUtils.isEmpty(userInfo.getDisplayName())) { if (!TextUtils.isEmpty(userInfo.getDisplayName())) {