Merge "AccountUnlockScreen: Explicitly register themeChange receiver" into jellybean (7e9660ec) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/AccountUnlockScreen.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -155,7 +155,10 @@ public class AccountUnlockScreen extends RelativeLayout implements KeyguardScree

		/** {@inheritDoc} */
		public void onPause() {
		if (mUiContext != null) {
		mContext.unregisterReceiver(mThemeChangeReceiver);
		mUiContext = null;
		}
		mKeyguardStatusViewManager.onPause();
		}

		@@ -165,7 +168,6 @@ public class AccountUnlockScreen extends RelativeLayout implements KeyguardScree
		mLogin.setText("");
		mPassword.setText("");
		mLogin.requestFocus();
		ThemeUtils.registerThemeChangeReceiver(mContext, mThemeChangeReceiver);
		mKeyguardStatusViewManager.onResume();
		}

		@@ -328,7 +330,7 @@ public class AccountUnlockScreen extends RelativeLayout implements KeyguardScree

		if (mCheckingDialog == null) {
		mUiContext = ThemeUtils.createUiContext(mContext);

		ThemeUtils.registerThemeChangeReceiver(mContext, mThemeChangeReceiver);
		final Context context = mUiContext != null ? mUiContext : mContext;

		mCheckingDialog = new ProgressDialog(context);