Merge "Fixed a crash where onTouch might have been called too early" into mnc-dev (b84ace51) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -634,7 +634,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,

		mStatusBarWindow = (StatusBarWindowView) View.inflate(context,
		R.layout.super_status_bar, null);
		mStatusBarWindow.mService = this;
		mStatusBarWindow.setService(this);
		mStatusBarWindow.setOnTouchListener(new View.OnTouchListener() {
		@Override
		public boolean onTouch(View v, MotionEvent event) {

+13 −5

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ public class StatusBarWindowView extends FrameLayout {

		private int mRightInset = 0;

		PhoneStatusBar mService;
		private PhoneStatusBar mService;
		private final Paint mTransparentSrcPaint = new Paint();

		public StatusBarWindowView(Context context, AttributeSet attrs) {
		@@ -124,14 +124,22 @@ public class StatusBarWindowView extends FrameLayout {
		}

		@Override
		protected void onAttachedToWindow () {
		super.onAttachedToWindow();

		protected void onFinishInflate() {
		super.onFinishInflate();
		mStackScrollLayout = (NotificationStackScrollLayout) findViewById(
		R.id.notification_stack_scroller);
		mNotificationPanel = (NotificationPanelView) findViewById(R.id.notification_panel);
		mDragDownHelper = new DragDownHelper(getContext(), this, mStackScrollLayout, mService);
		mBrightnessMirror = findViewById(R.id.brightness_mirror);
		}

		public void setService(PhoneStatusBar service) {
		mService = service;
		mDragDownHelper = new DragDownHelper(getContext(), this, mStackScrollLayout, mService);
		}

		@Override
		protected void onAttachedToWindow () {
		super.onAttachedToWindow();

		// We really need to be able to animate while window animations are going on
		// so that activities may be started asynchronously from panel animations