Merge "Merge TODO(b/217397817) to TODO(b/215443343)" into tm-dev (43eed3b4) · Commits · e / os / android_frameworks_base

core/java/android/inputmethodservice/NavigationBarController.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -294,8 +294,8 @@ final class NavigationBarController {
		dest.setTouchableInsets(
		ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_REGION);

		// TODO(b/205803355): See if we can use View#OnLayoutChangeListener().
		// TODO(b/205803355): See if we can replace DecorView#mNavigationColorViewState.view
		// TODO(b/215443343): See if we can use View#OnLayoutChangeListener().
		// TODO(b/215443343): See if we can replace DecorView#mNavigationColorViewState.view
		boolean zOrderChanged = false;
		if (decor instanceof ViewGroup) {
		ViewGroup decorGroup = (ViewGroup) decor;

+1 −1

Original line number	Diff line number	Diff line
		@@ -148,7 +148,7 @@ final class DeadZone {
		if (DEBUG) {
		Log.v(TAG, this + " ACTION_DOWN: " + event.getX() + "," + event.getY());
		}
		//TODO(b/205803355): call mNavBarController.touchAutoDim(mDisplayId); here
		//TODO(b/215443343): call mNavBarController.touchAutoDim(mDisplayId); here
		int size = (int) getSize(event.getEventTime());
		// In the vertical orientation consume taps along the left edge.
		// In horizontal orientation consume taps along the top edge.

+3 −3

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@ public class KeyButtonView extends ImageView implements ButtonInterface {
		public KeyButtonView(Context context, AttributeSet attrs) {
		super(context, attrs);

		// TODO(b/205803355): Figure out better place to set this.
		// TODO(b/215443343): Figure out better place to set this.
		switch (getId()) {
		case com.android.internal.R.id.input_method_nav_back:
		mCode = KEYCODE_BACK;
		@@ -285,11 +285,11 @@ public class KeyButtonView extends ImageView implements ButtonInterface {
		private void sendEvent(int action, int flags, long when) {
		if (mCode == KeyEvent.KEYCODE_BACK && flags != KeyEvent.FLAG_LONG_PRESS) {
		if (action == MotionEvent.ACTION_UP) {
		// TODO(b/205803355): Implement notifyBackAction();
		// TODO(b/215443343): Implement notifyBackAction();
		}
		}

		// TODO(b/205803355): Consolidate this logic to somewhere else.
		// TODO(b/215443343): Consolidate this logic to somewhere else.
		if (mContext instanceof InputMethodService) {
		final int repeatCount = (flags & KeyEvent.FLAG_LONG_PRESS) != 0 ? 1 : 0;
		final KeyEvent ev = new KeyEvent(mDownTime, when, action, mCode, repeatCount,