Merge "Fix clobbered RemoteInputView when changing position" into nyc-dev (fd8cdbbc) · Commits · e / os / android_frameworks_base

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

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -43,6 +43,7 @@ public abstract class ExpandableView extends FrameLayout {
	private boolean mWillBeGone;		private boolean mWillBeGone;
	private int mMinClipTopAmount = 0;		private int mMinClipTopAmount = 0;
	private boolean mClipToActualHeight = true;		private boolean mClipToActualHeight = true;
			private boolean mChangingPosition = false;

	public ExpandableView(Context context, AttributeSet attrs) {		public ExpandableView(Context context, AttributeSet attrs) {
	super(context, attrs);		super(context, attrs);
	@@ -407,6 +408,14 @@ public abstract class ExpandableView extends FrameLayout {
	return 0;		return 0;
	}		}

			public void setChangingPosition(boolean changingPosition) {
			mChangingPosition = changingPosition;
			}

			public boolean isChangingPosition() {
			return mChangingPosition;
			}

	/**		/**
	* A listener notifying when {@link #getActualHeight} changes.		* A listener notifying when {@link #getActualHeight} changes.
	*/		*/

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -154,9 +154,22 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene
	setVisibility(INVISIBLE);		setVisibility(INVISIBLE);
	}		}

			@Override
			protected void onAttachedToWindow() {
			super.onAttachedToWindow();
			if (mEntry.row.isChangingPosition()) {
			if (getVisibility() == VISIBLE && mEditText.isFocusable()) {
			mEditText.requestFocus();
			}
			}
			}

	@Override		@Override
	protected void onDetachedFromWindow() {		protected void onDetachedFromWindow() {
	super.onDetachedFromWindow();		super.onDetachedFromWindow();
			if (mEntry.row.isChangingPosition()) {
			return;
			}
	mController.removeRemoteInput(mEntry);		mController.removeRemoteInput(mEntry);
	}		}

	@@ -229,6 +242,9 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene
	}		}

	private void defocusIfNeeded() {		private void defocusIfNeeded() {
			if (mDefocusListener.mEntry.row.isChangingPosition()) {
			return;
			}
	if (isFocusable() && isEnabled()) {		if (isFocusable() && isEnabled()) {
	setInnerFocusable(false);		setInnerFocusable(false);
	if (mDefocusListener != null) {		if (mDefocusListener != null) {

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2252,8 +2252,10 @@ public class NotificationStackScrollLayout extends ViewGroup
	int currentIndex = indexOfChild(child);		int currentIndex = indexOfChild(child);
	if (child != null && child.getParent() == this && currentIndex != newIndex) {		if (child != null && child.getParent() == this && currentIndex != newIndex) {
	mChangePositionInProgress = true;		mChangePositionInProgress = true;
			((ExpandableView)child).setChangingPosition(true);
	removeView(child);		removeView(child);
	addView(child, newIndex);		addView(child, newIndex);
			((ExpandableView)child).setChangingPosition(false);
	mChangePositionInProgress = false;		mChangePositionInProgress = false;
	if (mIsExpanded && mAnimationsEnabled && child.getVisibility() != View.GONE) {		if (mIsExpanded && mAnimationsEnabled && child.getVisibility() != View.GONE) {
	mChildrenChangingPositions.add(child);		mChildrenChangingPositions.add(child);