Replace drag & drop constants with finalize ids (53e44995) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+23 −23

Original line number	Diff line number	Diff line
		@@ -14248,9 +14248,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		hideTooltip();
		return true;
		}
		}

		if (action == R.id.accessibilityActionDragDrop) {
		case R.id.accessibilityActionDragDrop: {
		if (!canAcceptAccessibilityDrop()) {
		return false;
		}
		@@ -14267,7 +14265,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		Log.e(VIEW_LOG_TAG, "Unable to drop for accessibility", e);
		}
		return false;
		} else if (action == R.id.accessibilityActionDragCancel) {
		}
		case R.id.accessibilityActionDragCancel: {
		if (!startedSystemDragForAccessibility()) {
		return false;
		}
		@@ -14277,6 +14276,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}
		return false;
		}
		}
		return false;
		}

+6 −8

Original line number	Diff line number	Diff line
		@@ -4321,15 +4321,13 @@ public class AccessibilityNodeInfo implements Parcelable {
		return "ACTION_PRESS_AND_HOLD";
		case R.id.accessibilityActionImeEnter:
		return "ACTION_IME_ENTER";
		default:
		// TODO(197520937): Use finalized constants in switch
		if (action == R.id.accessibilityActionDragStart) {
		case R.id.accessibilityActionDragStart:
		return "ACTION_DRAG";
		} else if (action == R.id.accessibilityActionDragCancel) {
		case R.id.accessibilityActionDragCancel:
		return "ACTION_CANCEL_DRAG";
		} else if (action == R.id.accessibilityActionDragDrop) {
		case R.id.accessibilityActionDragDrop:
		return "ACTION_DROP";
		}
		default:
		return "ACTION_UNKNOWN";
		}
		}