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

Commit 02358a56 authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Android (Google) Code Review
Browse files

Merge changes from topic "inline-reply-animation" into tm-qpr-dev

* changes:
  Fix headsup notification RemoteInputView appearance animation
  Fix notification inline reply animation
parents 9f99b0b7 4b01e37d
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:gravity="end"
        android:layout_gravity="bottom"
        android:orientation="horizontal"
        android:background="@color/notification_action_list_background_color"
        >
+1 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ android_library {
        "WindowManager-Shell",
        "LowLightDreamLib",
        "motion_tool_lib",
        "androidx.core_core-animation-testing-nodeps",
    ],
}

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@
<com.android.systemui.statusbar.policy.RemoteInputView
        xmlns:android="http://schemas.android.com/apk/res/android"
        android:id="@+id/remote_input"
        android:forceHasOverlappingRendering="false"
        android:layout_height="match_parent"
        android:layout_width="match_parent">
    <LinearLayout
+5 −0
Original line number Diff line number Diff line
@@ -103,6 +103,11 @@ object Flags {
    // TODO(b/257315550): Tracking Bug
    val NO_HUN_FOR_OLD_WHEN = unreleasedFlag(118, "no_hun_for_old_when", teamfood = true)

    // TODO(b/260335638): Tracking Bug
    @JvmField
    val NOTIFICATION_INLINE_REPLY_ANIMATION =
        unreleasedFlag(174148361, "notification_inline_reply_animation", teamfood = true)

    val FILTER_UNSEEN_NOTIFS_ON_KEYGUARD =
        unreleasedFlag(254647461, "filter_unseen_notifs_on_keyguard", teamfood = true)

+5 −1
Original line number Diff line number Diff line
@@ -463,7 +463,11 @@ public class NotificationRemoteInputManager implements Dumpable {
        riv.getController().setRemoteInput(input);
        riv.getController().setRemoteInputs(inputs);
        riv.getController().setEditedSuggestionInfo(editedSuggestionInfo);
        riv.focusAnimated();
        ViewGroup parent = view.getParent() != null ? (ViewGroup) view.getParent() : null;
        if (parent != null) {
            riv.setDefocusTargetHeight(parent.getHeight());
        }
        riv.focusAnimated(parent);
        if (userMessageContent != null) {
            riv.setEditTextContent(userMessageContent);
        }
Loading