SystemUI : Fix multi-user for keyguard (4ccaf0a8) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/keyguard_bottom_area.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@
		android:layout_height="wrap_content"
		android:layout_width="match_parent"
		android:outlineProvider="none"
		android:visibility="gone"
		android:elevation="5dp" > <!-- Put it above the status bar header -->

		<com.android.systemui.statusbar.phone.KeyguardIndicationTextView

+9 −7

Original line number	Diff line number	Diff line
		@@ -147,7 +147,6 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL

		@Override
		public void setVisibility(int visibility) {
		if (visibility != getVisibility()) {
		if (visibility == View.VISIBLE) {
		if (!mBottomAreaAttached) {
		addKeyguardBottomArea(false);
		@@ -155,7 +154,6 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
		} else if (mBottomAreaAttached) {
		removeKeyguardBottomArea();
		}
		}
		super.setVisibility(visibility);
		}

		@@ -781,6 +779,10 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
		.setDuration(DOZE_ANIMATION_ELEMENT_DURATION);
		}

		public void cleanup() {
		removeKeyguardBottomArea();
		}

		private final class DevicePolicyBroadcastReceiver extends BroadcastReceiver {
		@Override
		public void onReceive(Context context, Intent intent) {

+0 −4

Original line number	Diff line number	Diff line
		@@ -1877,10 +1877,6 @@ public class NotificationPanelView extends PanelView implements
		updateNotificationTranslucency();
		updatePanelExpanded();
		mNotificationStackScroller.setShadeExpanded(!isFullyCollapsed());
		if (mShowingExternalKeyguard && expandedHeight >= getMaxPanelHeight()) {
		mStatusBar.unfocusKeyguardExternalView();
		mShowingExternalKeyguard = false;
		}
		if (DEBUG) {
		invalidate();
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -3787,6 +3787,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		mLiveLockScreenController.cleanup();
		}

		mKeyguardBottomArea.cleanup();
		mStatusBarWindow.removeContent(mStatusBarWindowContent);
		mStatusBarWindow.clearDisappearingChildren();