resolve merge conflicts of c08a40267be5 to master (bb99cb3e) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -170,7 +170,7 @@ public class NotificationShelf extends ActivatableNotificationView implements
		openedAmount = Math.min(1.0f, openedAmount);
		mShelfState.openedAmount = openedAmount;
		mShelfState.clipTopAmount = 0;
		mShelfState.alpha = mAmbientState.isPulsing() ? 0 : 1;
		mShelfState.alpha = mAmbientState.hasPulsingNotifications() ? 0 : 1;
		mShelfState.belowSpeedBump = mAmbientState.getSpeedBumpIndex() == 0;
		mShelfState.shadowAlpha = 1.0f;
		mShelfState.hideSensitive = false;

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

+37 −15

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ public abstract class PanelView extends FrameLayout {
		private long mDownTime;
		private float mMinExpandHeight;
		private LockscreenGestureLogger mLockscreenGestureLogger = new LockscreenGestureLogger();
		private boolean mPanelUpdateWhenAnimatorEnds;

		private final void logf(String fmt, Object... args) {
		Log.v(TAG, (mViewName != null ? (mViewName + ": ") : "") + String.format(fmt, args));
		@@ -508,7 +509,7 @@ public abstract class PanelView extends FrameLayout {

		@Override
		public boolean onInterceptTouchEvent(MotionEvent event) {
		if (mInstantExpanding \|\| !mNotificationsDragEnabled
		if (mInstantExpanding \|\| !mNotificationsDragEnabled \|\| mTouchDisabled
		\|\| (mMotionAborted && event.getActionMasked() != MotionEvent.ACTION_DOWN)) {
		return false;
		}
		@@ -759,14 +760,14 @@ public abstract class PanelView extends FrameLayout {
		if (clearAllExpandHack && !mCancelled) {
		setExpandedHeightInternal(getMaxPanelHeight());
		}
		mHeightAnimator = null;
		setAnimator(null);
		if (!mCancelled) {
		notifyExpandingFinished();
		}
		notifyBarPanelExpansionChanged();
		}
		});
		mHeightAnimator = animator;
		setAnimator(animator);
		animator.start();
		}

		@@ -803,15 +804,28 @@ public abstract class PanelView extends FrameLayout {
		protected void requestPanelHeightUpdate() {
		float currentMaxPanelHeight = getMaxPanelHeight();

		// If the user isn't actively poking us, let's update the height
		if ((!mTracking \|\| isTrackingBlocked())
		&& mHeightAnimator == null
		&& !isFullyCollapsed()
		&& currentMaxPanelHeight != mExpandedHeight
		&& mPeekAnimator == null
		&& !mPeekTouching) {
		setExpandedHeight(currentMaxPanelHeight);
		if (isFullyCollapsed()) {
		return;
		}

		if (currentMaxPanelHeight == mExpandedHeight) {
		return;
		}

		if (mPeekAnimator != null \|\| mPeekTouching) {
		return;
		}

		if (mTracking && !isTrackingBlocked()) {
		return;
		}

		if (mHeightAnimator != null) {
		mPanelUpdateWhenAnimatorEnds = true;
		return;
		}

		setExpandedHeight(currentMaxPanelHeight);
		}

		public void setExpandedHeightInternal(float h) {
		@@ -1063,7 +1077,7 @@ public abstract class PanelView extends FrameLayout {
		@Override
		public void onAnimationEnd(Animator animation) {
		if (mCancelled) {
		mHeightAnimator = null;
		setAnimator(null);
		onAnimationFinished.run();
		} else {
		startUnlockHintAnimationPhase2(onAnimationFinished);
		@@ -1071,7 +1085,7 @@ public abstract class PanelView extends FrameLayout {
		}
		});
		animator.start();
		mHeightAnimator = animator;
		setAnimator(animator);

		View[] viewsToAnimate = {
		mKeyguardBottomArea.getIndicationArea(),
		@@ -1093,6 +1107,14 @@ public abstract class PanelView extends FrameLayout {
		}
		}

		private void setAnimator(ValueAnimator animator) {
		mHeightAnimator = animator;
		if (animator == null && mPanelUpdateWhenAnimatorEnds) {
		mPanelUpdateWhenAnimatorEnds = false;
		requestPanelHeightUpdate();
		}
		}

		/**
		* Phase 2: Bounce down.
		*/
		@@ -1103,13 +1125,13 @@ public abstract class PanelView extends FrameLayout {
		animator.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationEnd(Animator animation) {
		mHeightAnimator = null;
		setAnimator(null);
		onAnimationFinished.run();
		notifyBarPanelExpansionChanged();
		}
		});
		animator.start();
		mHeightAnimator = animator;
		setAnimator(animator);
		}

		private ValueAnimator createHeightAnimator(float targetHeight) {

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -5020,7 +5020,6 @@ public class StatusBar extends SystemUI implements DemoMode,
		where.getLocationInWindow(mTmpInt2);
		mWakeUpTouchLocation = new PointF(mTmpInt2[0] + where.getWidth() / 2,
		mTmpInt2[1] + where.getHeight() / 2);
		mNotificationPanel.setTouchDisabled(false);
		mStatusBarKeyguardViewManager.notifyDeviceWakeUpRequested();
		mFalsingManager.onScreenOnFromTouch();
		}

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

+1 −1

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

		@Override
		public boolean onInterceptTouchEvent(MotionEvent ev) {
		if (mService.isDozing() && !mService.isPulsing()) {
		if (mService.isDozing() && !mStackScrollLayout.hasPulsingNotifications()) {
		// Capture all touch events in always-on.
		return true;
		}

packages/SystemUI/src/com/android/systemui/statusbar/stack/AmbientState.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ public class AmbientState {
		private boolean mPanelTracking;
		private boolean mExpansionChanging;
		private boolean mPanelFullWidth;
		private boolean mPulsing;
		private boolean mHasPulsingNotifications;
		private boolean mUnlockHintRunning;

		public AmbientState(Context context) {
		@@ -287,12 +287,12 @@ public class AmbientState {
		mPanelTracking = panelTracking;
		}

		public boolean isPulsing() {
		return mPulsing;
		public boolean hasPulsingNotifications() {
		return mHasPulsingNotifications;
		}

		public void setPulsing(boolean pulsing) {
		mPulsing = pulsing;
		public void setHasPulsingNotifications(boolean hasPulsing) {
		mHasPulsingNotifications = hasPulsing;
		}

		public boolean isPanelTracking() {