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

am ce58bb7d: Merge "Make simple user switcher notice setting changes." into lmp-dev

Browse Source 
* commit 'ce58bb7dc7eb4f5f253a46941fbc22d869138b99':
  Make simple user switcher notice setting changes.
This commit is contained in:
Jason Monk
2014-08-11 19:20:47 +00:00
committed by Android Git Automerger
parent f94a385de1 7036cb6bac
commit e6fee98782
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,10 +49,10 @@ public class KeyguardUserSwitcher {
private final ViewGroup mUserSwitcher;
private final KeyguardStatusBarView mStatusBarView;
private final Adapter mAdapter;
private final boolean mSimpleUserSwitcher;
private final AppearAnimationUtils mAppearAnimationUtils;
private final KeyguardUserSwitcherScrim mBackground;
private ObjectAnimator mBgAnimator;
private UserSwitcherController mUserSwitcherController;
public KeyguardUserSwitcher(Context context, ViewStub userSwitcher,
KeyguardStatusBarView statusBarView, NotificationPanelView panelView,
@@ -66,7 +66,7 @@ public class KeyguardUserSwitcher {
panelView.setKeyguardUserSwitcher(this);
mAdapter = new Adapter(context, userSwitcherController);
mAdapter.registerDataSetObserver(mDataSetObserver);
mSimpleUserSwitcher = userSwitcherController.isSimpleUserSwitcher();
mUserSwitcherController = userSwitcherController;
mAppearAnimationUtils = new AppearAnimationUtils(context, 400, -0.5f, 0.5f,
AnimationUtils.loadInterpolator(
context, android.R.interpolator.fast_out_slow_in));
@@ -74,7 +74,6 @@ public class KeyguardUserSwitcher {
mUserSwitcher = null;
mStatusBarView = null;
mAdapter = null;
mSimpleUserSwitcher = false;
mAppearAnimationUtils = null;
mBackground = null;
}
@@ -95,7 +94,7 @@ public class KeyguardUserSwitcher {
* @see android.os.UserManager#isUserSwitcherEnabled()
*/
private boolean shouldExpandByDefault() {
return mSimpleUserSwitcher;
return (mUserSwitcherController != null) && mUserSwitcherController.isSimpleUserSwitcher();
}
public void show(boolean animate) {