Snap for 10712072 from b31e95afe51d0eb22b4b544450066caab92a1f8f to udc-qpr1-release (e02d5628) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -9236,8 +9236,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}

		while (parentGroup != null && !parentGroup.isImportantForAutofill()) {
		ignoredParentLeft += parentGroup.mLeft;
		ignoredParentTop += parentGroup.mTop;
		ignoredParentLeft += parentGroup.mLeft - parentGroup.mScrollX;
		ignoredParentTop += parentGroup.mTop - parentGroup.mScrollY;

		viewParent = parentGroup.getParent();
		if (viewParent instanceof View) {

core/java/com/android/internal/jank/InteractionJankMonitor.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -82,6 +82,7 @@ import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_IN
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_SCROLL_FLING;
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SPLASHSCREEN_AVD;
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SPLASHSCREEN_EXIT_ANIM;
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SPLIT_SCREEN_DOUBLE_TAP_DIVIDER;
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SPLIT_SCREEN_ENTER;
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SPLIT_SCREEN_EXIT;
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SPLIT_SCREEN_RESIZE;
		@@ -272,7 +273,9 @@ public class InteractionJankMonitor {
		public static final int CUJ_IME_INSETS_SHOW_ANIMATION = 80;
		public static final int CUJ_IME_INSETS_HIDE_ANIMATION = 81;

		private static final int LAST_CUJ = CUJ_IME_INSETS_HIDE_ANIMATION;
		public static final int CUJ_SPLIT_SCREEN_DOUBLE_TAP_DIVIDER = 82;

		private static final int LAST_CUJ = CUJ_SPLIT_SCREEN_DOUBLE_TAP_DIVIDER;
		private static final int NO_STATSD_LOGGING = -1;

		// Used to convert CujType to InteractionType enum value for statsd logging.
		@@ -364,6 +367,7 @@ public class InteractionJankMonitor {
		CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_SHADE_EXPAND_FROM_STATUS_BAR] = UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_EXPAND_FROM_STATUS_BAR;
		CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_IME_INSETS_SHOW_ANIMATION] = UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__IME_INSETS_SHOW_ANIMATION;
		CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_IME_INSETS_HIDE_ANIMATION] = UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__IME_INSETS_HIDE_ANIMATION;
		CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_SPLIT_SCREEN_DOUBLE_TAP_DIVIDER] = UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SPLIT_SCREEN_DOUBLE_TAP_DIVIDER;
		}

		private static class InstanceHolder {
		@@ -466,6 +470,7 @@ public class InteractionJankMonitor {
		CUJ_SHADE_EXPAND_FROM_STATUS_BAR,
		CUJ_IME_INSETS_SHOW_ANIMATION,
		CUJ_IME_INSETS_HIDE_ANIMATION,
		CUJ_SPLIT_SCREEN_DOUBLE_TAP_DIVIDER,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface CujType {
		@@ -1083,6 +1088,8 @@ public class InteractionJankMonitor {
		return "IME_INSETS_SHOW_ANIMATION";
		case CUJ_IME_INSETS_HIDE_ANIMATION:
		return "IME_INSETS_HIDE_ANIMATION";
		case CUJ_SPLIT_SCREEN_DOUBLE_TAP_DIVIDER:
		return "SPLIT_SCREEN_DOUBLE_TAP_DIVIDER";
		}
		return "UNKNOWN";
		}

data/keyboards/Generic.kl

+4 −2

Original line number	Diff line number	Diff line
		@@ -439,8 +439,10 @@ key usage 0x0c007C KEYBOARD_BACKLIGHT_TOGGLE
		key usage 0x0c0173 MEDIA_AUDIO_TRACK
		key usage 0x0c019C PROFILE_SWITCH
		key usage 0x0c01A2 ALL_APPS
		key usage 0x0d0044 STYLUS_BUTTON_PRIMARY
		key usage 0x0d005a STYLUS_BUTTON_SECONDARY
		# TODO(b/297094448): Add stylus button mappings as a fallback when we have a way to determine
		# if a device can actually report it.
		# key usage 0x0d0044 STYLUS_BUTTON_PRIMARY
		# key usage 0x0d005a STYLUS_BUTTON_SECONDARY

		# Joystick and game controller axes.
		# Axes that are not mapped will be assigned generic axis numbers by the input subsystem.

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import static android.view.WindowManager.DOCKED_LEFT;
		import static android.view.WindowManager.DOCKED_RIGHT;
		import static android.view.WindowManager.DOCKED_TOP;

		import static com.android.internal.jank.InteractionJankMonitor.CUJ_SPLIT_SCREEN_DOUBLE_TAP_DIVIDER;
		import static com.android.internal.jank.InteractionJankMonitor.CUJ_SPLIT_SCREEN_RESIZE;
		import static com.android.wm.shell.common.split.DividerSnapAlgorithm.SnapTarget.FLAG_DISMISS_END;
		import static com.android.wm.shell.common.split.DividerSnapAlgorithm.SnapTarget.FLAG_DISMISS_START;
		@@ -660,11 +661,23 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
		set.playTogether(animator1, animator2, animator3);
		set.setDuration(FLING_SWITCH_DURATION);
		set.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationStart(Animator animation) {
		InteractionJankMonitorUtils.beginTracing(CUJ_SPLIT_SCREEN_DOUBLE_TAP_DIVIDER,
		mContext, getDividerLeash(), null /tag/);
		}

		@Override
		public void onAnimationEnd(Animator animation) {
		mDividePosition = dividerPos;
		updateBounds(mDividePosition);
		finishCallback.accept(insets);
		InteractionJankMonitorUtils.endTracing(CUJ_SPLIT_SCREEN_DOUBLE_TAP_DIVIDER);
		}

		@Override
		public void onAnimationCancel(Animator animation) {
		InteractionJankMonitorUtils.cancelTracing(CUJ_SPLIT_SCREEN_DOUBLE_TAP_DIVIDER);
		}
		});
		set.start();

media/java/android/media/session/MediaSession.java

+14 −9

Original line number	Diff line number	Diff line
		@@ -267,17 +267,22 @@ public final class MediaSession {
		}

		/**
		* Set a pending intent for your media button receiver to allow restarting
		* playback after the session has been stopped. If your app is started in
		* this way an {@link Intent#ACTION_MEDIA_BUTTON} intent will be sent via
		* the pending intent.
		* <p>
		* The pending intent is recommended to be explicit to follow the security recommendation of
		* {@link PendingIntent#getActivity}.
		* Set a pending intent for your media button receiver to allow restarting playback after the
		* session has been stopped.
		*
		* <p>If your app is started in this way an {@link Intent#ACTION_MEDIA_BUTTON} intent will be
		* sent via the pending intent.
		*
		* <p>The provided {@link PendingIntent} must not target an activity. Passing an activity
		* pending intent will cause the call to be ignored. Refer to this <a
		* href="https://developer.android.com/guide/components/activities/background-starts">guide</a>
		* for more information.
		*
		* <p>The pending intent is recommended to be explicit to follow the security recommendation of
		* {@link PendingIntent#getService}.
		*
		* @param mbr The {@link PendingIntent} to send the media button event to.
		* @see PendingIntent#getActivity
		*
		* @deprecated Use {@link #setMediaButtonBroadcastReceiver(ComponentName)} instead.
		*/
		@Deprecated
		@@ -285,7 +290,7 @@ public final class MediaSession {
		try {
		mBinder.setMediaButtonReceiver(mbr);
		} catch (RemoteException e) {
		Log.wtf(TAG, "Failure in setMediaButtonReceiver.", e);
		e.rethrowFromSystemServer();
		}
		}