Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fd8a4fd authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "QS: Fix QS touch breaking" into nyc-dev

parents d3827be1 d075b21a

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

+23 −21
Original line number Original line Diff line number Diff line
@@ -220,18 +220,8 @@ public class NotificationPanelView extends PanelView implements 
        super.onFinishInflate();

        super.onFinishInflate();

        mKeyguardStatusBar = (KeyguardStatusBarView) findViewById(R.id.keyguard_header);

        mKeyguardStatusBar = (KeyguardStatusBarView) findViewById(R.id.keyguard_header);

        mKeyguardStatusView = (KeyguardStatusView) findViewById(R.id.keyguard_status_view);

        mKeyguardStatusView = (KeyguardStatusView) findViewById(R.id.keyguard_status_view);

        mQsAutoReinflateContainer =

                (AutoReinflateContainer) findViewById(R.id.qs_auto_reinflate_container);

        mQsAutoReinflateContainer.addInflateListener(new InflateListener() {

            @Override

            public void onInflated(View v) {

                mQsContainer = (QSContainer) v.findViewById(R.id.quick_settings_container);

                mQsContainer.setPanelView(NotificationPanelView.this);

                mQsContainer.getHeader().findViewById(R.id.expand_indicator)

                        .setOnClickListener(NotificationPanelView.this);

            }

        });

        mClockView = (TextView) findViewById(R.id.clock_view);

        mClockView = (TextView) findViewById(R.id.clock_view);



        mNotificationContainerParent = (NotificationsQuickSettingsContainer)

        mNotificationContainerParent = (NotificationsQuickSettingsContainer)

                findViewById(R.id.notification_container_parent);

                findViewById(R.id.notification_container_parent);

        mNotificationStackScroller = (NotificationStackScrollLayout)

        mNotificationStackScroller = (NotificationStackScrollLayout)
@@ -239,12 +229,21 @@ public class NotificationPanelView extends PanelView implements 
        mNotificationStackScroller.setOnHeightChangedListener(this);

        mNotificationStackScroller.setOnHeightChangedListener(this);

        mNotificationStackScroller.setOverscrollTopChangedListener(this);

        mNotificationStackScroller.setOverscrollTopChangedListener(this);

        mNotificationStackScroller.setOnEmptySpaceClickListener(this);

        mNotificationStackScroller.setOnEmptySpaceClickListener(this);

        mNotificationStackScroller.setQsContainer(mQsContainer);

        mKeyguardBottomArea = (KeyguardBottomAreaView) findViewById(R.id.keyguard_bottom_area);

        mKeyguardBottomArea = (KeyguardBottomAreaView) findViewById(R.id.keyguard_bottom_area);

        mQsNavbarScrim = findViewById(R.id.qs_navbar_scrim);

        mQsNavbarScrim = findViewById(R.id.qs_navbar_scrim);

        mAfforanceHelper = new KeyguardAffordanceHelper(this, getContext());

        mAfforanceHelper = new KeyguardAffordanceHelper(this, getContext());

        mLastOrientation = getResources().getConfiguration().orientation;

        mLastOrientation = getResources().getConfiguration().orientation;





        mQsAutoReinflateContainer =

                (AutoReinflateContainer) findViewById(R.id.qs_auto_reinflate_container);

        mQsAutoReinflateContainer.addInflateListener(new InflateListener() {

            @Override

            public void onInflated(View v) {

                mQsContainer = (QSContainer) v.findViewById(R.id.quick_settings_container);

                mQsContainer.setPanelView(NotificationPanelView.this);

                mQsContainer.getHeader().findViewById(R.id.expand_indicator)

                        .setOnClickListener(NotificationPanelView.this);



                // recompute internal state when qspanel height changes

                // recompute internal state when qspanel height changes

                mQsContainer.addOnLayoutChangeListener(new OnLayoutChangeListener() {

                mQsContainer.addOnLayoutChangeListener(new OnLayoutChangeListener() {

                    @Override

                    @Override
@@ -257,6 +256,9 @@ public class NotificationPanelView extends PanelView implements 
                        }

                        }

                    }

                    }

                });

                });

                mNotificationStackScroller.setQsContainer(mQsContainer);

            }

        });

    }

    }





    @Override

    @Override