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

Merge "Fix issue with manual touch dispatch" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-06-21 16:10:35 +00:00
committed by Android (Google) Code Review
parent 80167ec0c7 45611dd8d4
commit 0fb45603fe
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
View File

@@ -847,6 +847,7 @@ public class StatusBar extends SystemUI implements DemoMode,
} }
mHeadsUpAppearanceController = new HeadsUpAppearanceController( mHeadsUpAppearanceController = new HeadsUpAppearanceController(
mNotificationIconAreaController, mHeadsUpManager, mStatusBarWindow); mNotificationIconAreaController, mHeadsUpManager, mStatusBarWindow);
mStatusBarWindow.setStatusBarView(mStatusBarView);
setAreThereNotifications(); setAreThereNotifications();
checkBarModes(); checkBarModes();
}).getFragmentManager() }).getFragmentManager()

7
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
View File

@@ -76,6 +76,7 @@ public class StatusBarWindowView extends FrameLayout {
private NotificationStackScrollLayout mStackScrollLayout; private NotificationStackScrollLayout mStackScrollLayout;
private NotificationPanelView mNotificationPanel; private NotificationPanelView mNotificationPanel;
private View mBrightnessMirror; private View mBrightnessMirror;
private PhoneStatusBarView mStatusBarView;
private int mRightInset = 0; private int mRightInset = 0;
private int mLeftInset = 0; private int mLeftInset = 0;
@@ -204,6 +205,10 @@ public class StatusBarWindowView extends FrameLayout {
} }
} }
public void setStatusBarView(PhoneStatusBarView statusBarView) {
mStatusBarView = statusBarView;
}
public void setService(StatusBar service) { public void setService(StatusBar service) {
mService = service; mService = service;
setDragDownHelper(new DragDownHelper(getContext(), this, mStackScrollLayout, mService)); setDragDownHelper(new DragDownHelper(getContext(), this, mStackScrollLayout, mService));
@@ -326,7 +331,7 @@ public class StatusBarWindowView extends FrameLayout {
expandingBelowNotch = true; expandingBelowNotch = true;
} }
if (expandingBelowNotch) { if (expandingBelowNotch) {
return mNotificationPanel.dispatchTouchEvent(ev); return mStatusBarView.dispatchTouchEvent(ev);
} }
return super.dispatchTouchEvent(ev); return super.dispatchTouchEvent(ev);