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

Merge "QS: Fix QS touch breaking" into nyc-dev am: 8fd8a4fde8

Browse Source 
am: 2d202facb4

* commit '2d202facb4ccb7aa56373241ca60ab1be843436f':
  QS: Fix QS touch breaking

Change-Id: Ie9842470a766d0fdd4d4672ad597f66348895f00
This commit is contained in:
Jason Monk
2016-05-25 17:30:05 +00:00
committed by android-build-merger
parent d6801ac612 2d202facb4
commit 9f3eecb2e1
1 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -220,6 +220,20 @@ 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);
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 = mQsAutoReinflateContainer =
(AutoReinflateContainer) findViewById(R.id.qs_auto_reinflate_container); (AutoReinflateContainer) findViewById(R.id.qs_auto_reinflate_container);
mQsAutoReinflateContainer.addInflateListener(new InflateListener() { mQsAutoReinflateContainer.addInflateListener(new InflateListener() {
@@ -229,21 +243,6 @@ public class NotificationPanelView extends PanelView implements
mQsContainer.setPanelView(NotificationPanelView.this); mQsContainer.setPanelView(NotificationPanelView.this);
mQsContainer.getHeader().findViewById(R.id.expand_indicator) mQsContainer.getHeader().findViewById(R.id.expand_indicator)
.setOnClickListener(NotificationPanelView.this); .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 // recompute internal state when qspanel height changes
mQsContainer.addOnLayoutChangeListener(new OnLayoutChangeListener() { mQsContainer.addOnLayoutChangeListener(new OnLayoutChangeListener() {
@@ -257,6 +256,9 @@ public class NotificationPanelView extends PanelView implements
} }
} }
}); });
mNotificationStackScroller.setQsContainer(mQsContainer);
}
});
} }
@Override @Override