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

am b892ac68: Merge "Fix glitch with switching users from QuickSettings" into klp-dev

Browse Source 
* commit 'b892ac680b045daca2926037955857889d32e1c0':
  Fix glitch with switching users from QuickSettings
This commit is contained in:
Jim Miller
2013-11-06 19:16:59 -08:00
committed by Android Git Automerger
parent aa719e92ff b892ac680b
commit b8aba3f4df
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
View File

@@ -314,11 +314,19 @@ class QuickSettings {
collapsePanels();
final UserManager um = UserManager.get(mContext);
if (um.getUsers(true).size() > 1) {
try {
WindowManagerGlobal.getWindowManagerService().lockNow(null);
} catch (RemoteException e) {
Log.e(TAG, "Couldn't show user switcher", e);
}
// Since keyguard and systemui were merged into the same process to save
// memory, they share the same Looper and graphics context. As a result,
// there's no way to allow concurrent animation while keyguard inflates.
// The workaround is to add a slight delay to allow the animation to finish.
mHandler.postDelayed(new Runnable() {
public void run() {
try {
WindowManagerGlobal.getWindowManagerService().lockNow(null);
} catch (RemoteException e) {
Log.e(TAG, "Couldn't show user switcher", e);
}
}
}, 400); // TODO: ideally this would be tied to the collapse of the panel
} else {
Intent intent = ContactsContract.QuickContact.composeQuickContactsIntent(
mContext, v, ContactsContract.Profile.CONTENT_URI,