Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f235edf2: Merge "Refresh user list a little more eagerly" into lmp-mr1-dev

Browse Source 
* commit 'f235edf21532c63f149ad8653a76558fba087f3e':
  Refresh user list a little more eagerly
This commit is contained in:
Adrian Roos
2014-12-03 17:19:35 +00:00
committed by Android Git Automerger
parent 5303451efc f235edf215
commit b67d8ef665
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java
View File

@@ -47,6 +47,10 @@ public class UserDetailView extends PseudoGridView {
ViewGroupAdapterBridge.link(this, mAdapter); ViewGroupAdapterBridge.link(this, mAdapter);
} }
public void refreshAdapter() {
mAdapter.refresh();
}
public static class Adapter extends UserSwitcherController.BaseUserAdapter public static class Adapter extends UserSwitcherController.BaseUserAdapter
implements OnClickListener { implements OnClickListener {

1
packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcher.java
View File

@@ -107,6 +107,7 @@ public class KeyguardUserSwitcher {
public void show(boolean animate) { public void show(boolean animate) {
if (mUserSwitcher != null && mUserSwitcherContainer.getVisibility() != View.VISIBLE) { if (mUserSwitcher != null && mUserSwitcherContainer.getVisibility() != View.VISIBLE) {
cancelAnimations(); cancelAnimations();
mAdapter.refresh();
mUserSwitcherContainer.setVisibility(View.VISIBLE); mUserSwitcherContainer.setVisibility(View.VISIBLE);
mStatusBarView.setKeyguardUserSwitcherShowing(true, animate); mStatusBarView.setKeyguardUserSwitcherShowing(true, animate);
if (animate) { if (animate) {

17
packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
View File

@@ -417,18 +417,6 @@ public class UserSwitcherController {
} }
} }
public int getSwitchableUsers() {
int result = 0;
ArrayList<UserRecord> users = mController.mUsers;
int N = users.size();
for (int i = 0; i < N; i++) {
if (users.get(i).info != null) {
result++;
}
}
return result;
}
public Drawable getDrawable(Context context, UserRecord item) { public Drawable getDrawable(Context context, UserRecord item) {
if (item.isAddUser) { if (item.isAddUser) {
return context.getDrawable(R.drawable.ic_add_circle_qs); return context.getDrawable(R.drawable.ic_add_circle_qs);
@@ -436,6 +424,10 @@ public class UserSwitcherController {
return UserIcons.getDefaultUserIcon(item.isGuest ? UserHandle.USER_NULL : item.info.id, return UserIcons.getDefaultUserIcon(item.isGuest ? UserHandle.USER_NULL : item.info.id,
/* light= */ true); /* light= */ true);
} }
public void refresh() {
mController.refreshUsers(UserHandle.USER_NULL);
}
} }
public static final class UserRecord { public static final class UserRecord {
@@ -500,6 +492,7 @@ public class UserSwitcherController {
} else { } else {
v = (UserDetailView) convertView; v = (UserDetailView) convertView;
} }
v.refreshAdapter();
return v; return v;
} }