Merge "Remove shade peek" into sc-dev (e7f4edff) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -2438,18 +2438,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		return mTopPaddingOverflow;
		}

		@ShadeViewRefactor(RefactorComponent.COORDINATOR)
		public int getPeekHeight() {
		final ExpandableView firstChild = getFirstChildNotGone();
		final int firstChildMinHeight = firstChild != null ? firstChild.getCollapsedHeight()
		: mCollapsedSize;
		int shelfHeight = 0;
		if (getLastVisibleSection() != null && mShelf.getVisibility() != GONE) {
		shelfHeight = mShelf.getIntrinsicHeight();
		}
		return mIntrinsicPadding + firstChildMinHeight + shelfHeight;
		}

		@ShadeViewRefactor(RefactorComponent.COORDINATOR)
		private int clampPadding(int desiredPadding) {
		return Math.max(desiredPadding, mIntrinsicPadding);

+0 −4

Original line number	Diff line number	Diff line
		@@ -1061,10 +1061,6 @@ public class NotificationStackScrollLayoutController {
		mView.setUnlockHintRunning(running);
		}

		public float getPeekHeight() {
		return mView.getPeekHeight();
		}

		public boolean isFooterViewNotGone() {
		return mView.isFooterViewNotGone();
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -118,7 +118,6 @@ public class HeadsUpTouchHelper implements Gefingerpoken {
		mPanel.setPanelScrimMinFraction(maxPanelHeight > 0f
		? (float) startHeight / maxPanelHeight : 0f);
		mPanel.startExpandMotion(x, y, true /* startTracking */, startHeight);
		mPanel.startExpandingFromPeek();
		// This call needs to be after the expansion start otherwise we will get a
		// flicker of one frame as it's not expanded yet.
		mHeadsUpManager.unpinAll(true);

+0 −9

Original line number	Diff line number	Diff line
		@@ -2830,15 +2830,6 @@ public class NotificationPanelViewController extends PanelViewController {
		mNotificationStackScrollLayoutController.setUnlockHintRunning(true);
		}

		@Override
		protected float getPeekHeight() {
		if (mNotificationStackScrollLayoutController.getNotGoneChildCount() > 0) {
		return mNotificationStackScrollLayoutController.getPeekHeight();
		} else {
		return mQsMinExpansionHeight;
		}
		}

		@Override
		protected boolean shouldUseDismissingAnimation() {
		return mBarState != StatusBarState.SHADE && (mKeyguardStateController.canDismissLockScreen()

+0 −1

Original line number	Diff line number	Diff line
		@@ -212,7 +212,6 @@ public abstract class PanelBar extends FrameLayout {
		} else {
		pv.resetViews(false /* animate */);
		pv.setExpandedFraction(0); // just in case
		pv.cancelPeek();
		}
		if (DEBUG) LOG("collapsePanel: animate=%s waiting=%s", animate, waiting);
		if (!waiting && mState != STATE_CLOSED) {