Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f70b57a authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8898488 from b5a509e7 to tm-qpr1-release 

Change-Id: I4a88169e0a84f93bb71562449fd75ef1797bfa5d
parents 58889624 b5a509e7

core/java/android/view/RemoteAnimationTarget.java

+18 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import android.os.Build; 
import android.os.Parcel;

import android.os.Parcelable;

import android.util.proto.ProtoOutputStream;

import android.window.TaskSnapshot;



import java.io.PrintWriter;

import java.lang.annotation.Retention;
@@ -234,6 +235,12 @@ public class RemoteAnimationTarget implements Parcelable { 
     */

    public @ColorInt int backgroundColor;



    /**

     * Whether the activity is going to show IME on the target window after the app transition.

     * @see TaskSnapshot#hasImeSurface() that used the task snapshot during animating task.

     */

    public boolean willShowImeOnTarget;



    public RemoteAnimationTarget(int taskId, int mode, SurfaceControl leash, boolean isTranslucent,

            Rect clipRect, Rect contentInsets, int prefixOrderIndex, Point position,

            Rect localBounds, Rect screenSpaceBounds,
@@ -294,12 +301,21 @@ public class RemoteAnimationTarget implements Parcelable { 
        hasAnimatingParent = in.readBoolean();

        backgroundColor = in.readInt();

        showBackdrop = in.readBoolean();

        willShowImeOnTarget = in.readBoolean();

    }



    public void setShowBackdrop(boolean shouldShowBackdrop) {

        showBackdrop = shouldShowBackdrop;

    }



    public void setWillShowImeOnTarget(boolean showImeOnTarget) {

        willShowImeOnTarget = showImeOnTarget;

    }



    public boolean willShowImeOnTarget() {

        return willShowImeOnTarget;

    }



    @Override

    public int describeContents() {

        return 0;
@@ -328,6 +344,7 @@ public class RemoteAnimationTarget implements Parcelable { 
        dest.writeBoolean(hasAnimatingParent);

        dest.writeInt(backgroundColor);

        dest.writeBoolean(showBackdrop);

        dest.writeBoolean(willShowImeOnTarget);

    }



    public void dump(PrintWriter pw, String prefix) {
@@ -350,6 +367,7 @@ public class RemoteAnimationTarget implements Parcelable { 
        pw.print(prefix); pw.print("hasAnimatingParent="); pw.print(hasAnimatingParent);

        pw.print(prefix); pw.print("backgroundColor="); pw.print(backgroundColor);

        pw.print(prefix); pw.print("showBackdrop="); pw.print(showBackdrop);

        pw.print(prefix); pw.print("willShowImeOnTarget="); pw.print(willShowImeOnTarget);

    }



    public void dumpDebug(ProtoOutputStream proto, long fieldId) {

core/java/android/window/ProxyOnBackInvokedDispatcher.java

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ public class ProxyOnBackInvokedDispatcher implements OnBackInvokedDispatcher { 
        }

        for (Pair<OnBackInvokedCallback, Integer> callbackPair : mCallbacks) {

            int priority = callbackPair.second;

            if (priority >= 0) {

            if (priority >= PRIORITY_DEFAULT) {

                mActualDispatcher.registerOnBackInvokedCallback(priority, callbackPair.first);

            } else {

                mActualDispatcher.registerSystemOnBackInvokedCallback(callbackPair.first);

core/java/android/window/TransitionInfo.java

+5 −1
Original line number Diff line number Diff line
@@ -116,6 +116,9 @@ public final class TransitionInfo implements Parcelable { 
    /** The first unused bit. This can be used by remotes to attach custom flags to this change. */

    public static final int FLAG_FIRST_CUSTOM = 1 << 10;



    /** The container is going to show IME on its task after the transition. */

    public static final int FLAG_WILL_IME_SHOWN = 1 << 11;



    /** @hide */

    @IntDef(prefix = { "FLAG_" }, value = {

            FLAG_NONE,
@@ -129,7 +132,8 @@ public final class TransitionInfo implements Parcelable { 
            FLAG_DISPLAY_HAS_ALERT_WINDOWS,

            FLAG_IS_INPUT_METHOD,

            FLAG_IS_EMBEDDED,

            FLAG_FIRST_CUSTOM

            FLAG_FIRST_CUSTOM,

            FLAG_WILL_IME_SHOWN

    })

    public @interface ChangeFlags {}

core/java/com/android/internal/util/OWNERS

+1 −0
Original line number Diff line number Diff line
@@ -5,3 +5,4 @@ per-file *ContrastColor* = file:/services/core/java/com/android/server/notificat 
per-file Protocol* = etancohen@google.com, lorenzo@google.com

per-file State* = jchalard@google.com, lorenzo@google.com, satk@google.com

per-file *Dump* = file:/core/java/com/android/internal/util/dump/OWNERS

per-file *Screenshot* = file:/packages/SystemUI/src/com/android/systemui/screenshot/OWNERS

core/tests/screenshothelpertests/OWNERS

0 → 100644
+2 −0
Original line number Diff line number Diff line 
# Bug component: 801321

file:/packages/SystemUI/src/com/android/systemui/screenshot/OWNERS