Scroll to remote input view (5153d4ac) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1731,7 +1731,7 @@ public class NotificationPanelView extends PanelView implements

		@Override
		public WindowInsets onApplyWindowInsets(WindowInsets insets) {
		mNavigationBarBottomHeight = insets.getSystemWindowInsetBottom();
		mNavigationBarBottomHeight = insets.getStableInsetBottom();
		updateMaxHeadsUpTranslation();
		return insets;
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ public class NotificationsQuickSettingsContainer extends FrameLayout

		@Override
		public WindowInsets onApplyWindowInsets(WindowInsets insets) {
		setPadding(0, 0, 0, insets.getSystemWindowInsetBottom());
		setPadding(0, 0, 0, insets.getStableInsetBottom());
		return insets;
		}

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

+1 −5

Original line number	Diff line number	Diff line
		@@ -138,12 +138,8 @@ public class StatusBarWindowManager implements RemoteInputController.Callback {
		mLpChanged.flags &= ~WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
		}

		if (state.remoteInputActive) {
		mLpChanged.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN;
		} else {
		mLpChanged.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE;
		}
		}

		private void applyHeight(State state) {
		boolean expanded = isExpanded(state);

packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java

+36 −25

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ import android.widget.TextView;
		import com.android.systemui.R;
		import com.android.systemui.statusbar.NotificationData;
		import com.android.systemui.statusbar.RemoteInputController;
		import com.android.systemui.statusbar.stack.LongPressCancelable;
		import com.android.systemui.statusbar.stack.ScrollContainer;

		/**
		* Host for the remote input.
		@@ -67,7 +67,9 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene
		private RemoteInputController mController;

		private NotificationData.Entry mEntry;
		private LongPressCancelable mLongPressCancelable;

		private ScrollContainer mScrollContainer;
		private View mScrollContainerChild;

		public RemoteInputView(Context context, AttributeSet attrs) {
		super(context, attrs);
		@@ -106,7 +108,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene
		mEditText.setOnClickListener(this);
		mEditText.addTextChangedListener(this);
		mEditText.setInnerFocusable(false);
		mEditText.mDefocusListener = this;
		mEditText.mRemoteInputView = this;
		}

		private void sendRemoteInput() {
		@@ -237,21 +239,32 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene
		@Override
		public boolean onInterceptTouchEvent(MotionEvent ev) {
		if (ev.getAction() == MotionEvent.ACTION_DOWN) {
		if (mLongPressCancelable == null) {
		ViewParent p = getParent();
		findScrollContainer();
		if (mScrollContainer != null) {
		mScrollContainer.requestDisallowLongPress();
		}
		}
		return super.onInterceptTouchEvent(ev);
		}

		public boolean requestScrollTo() {
		findScrollContainer();
		mScrollContainer.scrollTo(mScrollContainerChild);
		return true;
		}

		private void findScrollContainer() {
		if (mScrollContainer == null) {
		ViewParent p = this;
		while (p != null) {
		if (p instanceof LongPressCancelable) {
		mLongPressCancelable = (LongPressCancelable) p;
		if (p.getParent() instanceof ScrollContainer) {
		mScrollContainer = (ScrollContainer) p.getParent();
		mScrollContainerChild = (View) p;
		break;
		}
		p = p.getParent();
		}
		}
		if (mLongPressCancelable != null) {
		mLongPressCancelable.requestDisallowLongPress();
		}
		}
		return super.onInterceptTouchEvent(ev);
		}

		/**
		@@ -261,7 +274,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene
		public static class RemoteEditText extends EditText {

		private final Drawable mBackground;
		private RemoteInputView mDefocusListener;
		private RemoteInputView mRemoteInputView;
		boolean mShowImeOnInputConnection;

		public RemoteEditText(Context context, AttributeSet attrs) {
		@@ -270,13 +283,13 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene
		}

		private void defocusIfNeeded() {
		if (mDefocusListener.mEntry.row.isChangingPosition()) {
		if (mRemoteInputView != null && mRemoteInputView.mEntry.row.isChangingPosition()) {
		return;
		}
		if (isFocusable() && isEnabled()) {
		setInnerFocusable(false);
		if (mDefocusListener != null) {
		mDefocusListener.onDefocus();
		if (mRemoteInputView != null) {
		mRemoteInputView.onDefocus();
		}
		mShowImeOnInputConnection = false;
		}
		@@ -300,17 +313,15 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene
		}

		@Override
		public boolean requestRectangleOnScreen(Rect r) {
		public void getFocusedRect(Rect r) {
		super.getFocusedRect(r);
		r.top = mScrollY;
		r.bottom = mScrollY + (mBottom - mTop);
		return super.requestRectangleOnScreen(r);
		}

		@Override
		public void getFocusedRect(Rect r) {
		super.getFocusedRect(r);
		r.top = mScrollY;
		r.bottom = mScrollY + (mBottom - mTop);
		public boolean requestRectangleOnScreen(Rect rectangle) {
		return mRemoteInputView.requestScrollTo();
		}

		@Override

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

+52 −4

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ import android.view.View;
		import android.view.ViewConfiguration;
		import android.view.ViewGroup;
		import android.view.ViewTreeObserver;
		import android.view.WindowInsets;
		import android.view.animation.AnimationUtils;
		import android.view.animation.Interpolator;
		import android.widget.OverScroller;
		@@ -83,7 +84,7 @@ import java.util.HashSet;
		public class NotificationStackScrollLayout extends ViewGroup
		implements SwipeHelper.Callback, ExpandHelper.Callback, ScrollAdapter,
		ExpandableView.OnHeightChangedListener, NotificationGroupManager.OnGroupChangeListener,
		SettingsIconRowListener, LongPressCancelable {
		SettingsIconRowListener, ScrollContainer {

		public static final float BACKGROUND_ALPHA_DIMMED = 0.7f;
		private static final String TAG = "StackScroller";
		@@ -134,7 +135,7 @@ public class NotificationStackScrollLayout extends ViewGroup
		private int mPaddingBetweenElements;
		private int mIncreasedPaddingBetweenElements;
		private int mTopPadding;
		private int mCollapseSecondCardPadding;
		private int mBottomInset = 0;

		/**
		* The algorithm which calculates the properties for our children
		@@ -206,6 +207,7 @@ public class NotificationStackScrollLayout extends ViewGroup
		private float mStackTranslation;
		private float mTopPaddingOverflow;
		private boolean mDontReportNextOverScroll;
		private boolean mDontClampNextScroll;
		private boolean mRequestViewResizeAnimationOnLayout;
		private boolean mNeedViewResizeAnimation;
		private View mExpandedGroupView;
		@@ -905,6 +907,45 @@ public class NotificationStackScrollLayout extends ViewGroup
		mScrollingEnabled = enable;
		}

		public void scrollTo(View v) {
		ExpandableView expandableView = (ExpandableView) v;
		int positionInLinearLayout = getPositionInLinearLayout(v);

		int targetScroll = positionInLinearLayout + expandableView.getActualHeight() +
		mBottomInset - getHeight() + getTopPadding();
		if (mOwnScrollY < targetScroll) {
		mScroller.startScroll(mScrollX, mOwnScrollY, 0, targetScroll - mOwnScrollY);
		mDontReportNextOverScroll = true;
		postInvalidateOnAnimation();
		}
		}

		@Override
		public WindowInsets onApplyWindowInsets(WindowInsets insets) {
		mBottomInset = Math.max(0, insets.getSystemWindowInsetBottom()
		- (getRootView().getHeight() - getHeight()));

		int range = getScrollRange();
		if (mOwnScrollY > range) {
		// HACK: We're repeatedly getting staggered insets here while the IME is
		// animating away. To work around that we'll wait until things have settled.
		removeCallbacks(mReclamp);
		postDelayed(mReclamp, 50);
		}
		return insets;
		}

		private Runnable mReclamp = new Runnable() {
		@Override
		public void run() {
		int range = getScrollRange();
		mScroller.startScroll(mScrollX, mOwnScrollY, 0, range - mOwnScrollY);
		mDontReportNextOverScroll = true;
		mDontClampNextScroll = true;
		postInvalidateOnAnimation();
		}
		};

		public void setExpandingEnabled(boolean enable) {
		mExpandHelper.setEnabled(enable);
		}
		@@ -1237,7 +1278,7 @@ public class NotificationStackScrollLayout extends ViewGroup
		int y = mScroller.getCurrY();

		if (oldX != x \|\| oldY != y) {
		final int range = getScrollRange();
		int range = getScrollRange();
		if (y < 0 && oldY >= 0 \|\| y > range && oldY <= range) {
		float currVelocity = mScroller.getCurrVelocity();
		if (currVelocity >= mMinimumVelocity) {
		@@ -1245,6 +1286,9 @@ public class NotificationStackScrollLayout extends ViewGroup
		}
		}

		if (mDontClampNextScroll) {
		range = Math.max(range, oldY);
		}
		overScrollBy(x - oldX, y - oldY, oldX, oldY, 0, range,
		0, (int) (mMaxOverScroll), false);
		onScrollChanged(mScrollX, mOwnScrollY, oldX, oldY);
		@@ -1252,6 +1296,8 @@ public class NotificationStackScrollLayout extends ViewGroup

		// Keep on drawing until the animation has finished.
		postInvalidateOnAnimation();
		} else {
		mDontClampNextScroll = false;
		}
		}

		@@ -1455,7 +1501,9 @@ public class NotificationStackScrollLayout extends ViewGroup
		- firstChild.getMinHeight());
		}
		}
		return scrollRange;
		int imeOverlap = Math.max(0,
		getContentHeight() - (getHeight() - mBottomInset));
		return scrollRange + imeOverlap;
		}

		/**