From d075b21a85d0806ce37f75943c32799bea2befe3 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Wed, 25 May 2016 12:30:51 -0400 Subject: [PATCH] QS: Fix QS touch breaking Seems not all of the QS container logic was inside the inflate callback. Change-Id: I78a8b40d1c181f5dac7127a5b5d20d45ae0f333e Fixes: 28177371 --- .../phone/NotificationPanelView.java | 52 ++++++++++--------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index 6a37099d0b7da..522f2502e2566 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -220,6 +220,20 @@ public class NotificationPanelView extends PanelView implements super.onFinishInflate(); mKeyguardStatusBar = (KeyguardStatusBarView) findViewById(R.id.keyguard_header); mKeyguardStatusView = (KeyguardStatusView) findViewById(R.id.keyguard_status_view); + mClockView = (TextView) findViewById(R.id.clock_view); + + mNotificationContainerParent = (NotificationsQuickSettingsContainer) + findViewById(R.id.notification_container_parent); + mNotificationStackScroller = (NotificationStackScrollLayout) + findViewById(R.id.notification_stack_scroller); + mNotificationStackScroller.setOnHeightChangedListener(this); + mNotificationStackScroller.setOverscrollTopChangedListener(this); + mNotificationStackScroller.setOnEmptySpaceClickListener(this); + mKeyguardBottomArea = (KeyguardBottomAreaView) findViewById(R.id.keyguard_bottom_area); + mQsNavbarScrim = findViewById(R.id.qs_navbar_scrim); + mAfforanceHelper = new KeyguardAffordanceHelper(this, getContext()); + mLastOrientation = getResources().getConfiguration().orientation; + mQsAutoReinflateContainer = (AutoReinflateContainer) findViewById(R.id.qs_auto_reinflate_container); mQsAutoReinflateContainer.addInflateListener(new InflateListener() { @@ -229,32 +243,20 @@ public class NotificationPanelView extends PanelView implements mQsContainer.setPanelView(NotificationPanelView.this); mQsContainer.getHeader().findViewById(R.id.expand_indicator) .setOnClickListener(NotificationPanelView.this); - } - }); - mClockView = (TextView) findViewById(R.id.clock_view); - mNotificationContainerParent = (NotificationsQuickSettingsContainer) - findViewById(R.id.notification_container_parent); - mNotificationStackScroller = (NotificationStackScrollLayout) - findViewById(R.id.notification_stack_scroller); - mNotificationStackScroller.setOnHeightChangedListener(this); - mNotificationStackScroller.setOverscrollTopChangedListener(this); - mNotificationStackScroller.setOnEmptySpaceClickListener(this); - mNotificationStackScroller.setQsContainer(mQsContainer); - mKeyguardBottomArea = (KeyguardBottomAreaView) findViewById(R.id.keyguard_bottom_area); - mQsNavbarScrim = findViewById(R.id.qs_navbar_scrim); - mAfforanceHelper = new KeyguardAffordanceHelper(this, getContext()); - mLastOrientation = getResources().getConfiguration().orientation; - // recompute internal state when qspanel height changes - mQsContainer.addOnLayoutChangeListener(new OnLayoutChangeListener() { - @Override - public void onLayoutChange(View v, int left, int top, int right, int bottom, - int oldLeft, int oldTop, int oldRight, int oldBottom) { - final int height = bottom - top; - final int oldHeight = oldBottom - oldTop; - if (height != oldHeight) { - onQsHeightChanged(); - } + // recompute internal state when qspanel height changes + mQsContainer.addOnLayoutChangeListener(new OnLayoutChangeListener() { + @Override + public void onLayoutChange(View v, int left, int top, int right, int bottom, + int oldLeft, int oldTop, int oldRight, int oldBottom) { + final int height = bottom - top; + final int oldHeight = oldBottom - oldTop; + if (height != oldHeight) { + onQsHeightChanged(); + } + } + }); + mNotificationStackScroller.setQsContainer(mQsContainer); } }); }