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

Commit 7812cce9 authored by Miranda Kephart's avatar Miranda Kephart Committed by Android (Google) Code Review
Browse files

Merge "Animate in clipboard minimized view" into main

parents 997be753 73f93863

packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java

+3 −2
Original line number Diff line number Diff line
@@ -61,12 +61,12 @@ import androidx.annotation.Nullable; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.logging.UiEventLogger;

import com.android.systemui.res.R;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.broadcast.BroadcastSender;

import com.android.systemui.clipboardoverlay.dagger.ClipboardOverlayModule.OverlayWindowContext;

import com.android.systemui.dagger.qualifiers.Background;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.res.R;

import com.android.systemui.screenshot.TimeoutHandler;



import java.util.Optional;
@@ -297,6 +297,7 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv 
                    mClipboardLogger.logUnguarded(CLIPBOARD_OVERLAY_SHOWN_MINIMIZED);

                    mIsMinimized = true;

                    mView.setMinimized(true);

                    animateIn();

                } else {

                    mClipboardLogger.logUnguarded(CLIPBOARD_OVERLAY_SHOWN_EXPANDED);

                    setExpandedView(this::animateIn);
@@ -318,8 +319,8 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv 
                } else {

                    mClipboardLogger.logUnguarded(CLIPBOARD_OVERLAY_SHOWN_EXPANDED);

                    setExpandedView();

                    animateIn();

                }

                animateIn();

                mView.announceForAccessibility(

                        getAccessibilityAnnouncement(mClipboardModel.getType()));

            } else if (!mIsMinimized) {

packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardOverlayControllerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -444,6 +444,7 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase { 


        verify(mClipboardOverlayView, never()).setMinimized(true);

        verify(mClipboardOverlayView).setMinimized(false);

        verify(mClipboardOverlayView).getEnterAnimation();

        verify(mClipboardOverlayView).showTextPreview("Test Item", false);

    }
@@ -458,6 +459,7 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase { 


        verify(mClipboardOverlayView).setMinimized(true);

        verify(mUiEventLogger, times(1)).log(CLIPBOARD_OVERLAY_SHOWN_MINIMIZED, 0, "abc");

        verify(mClipboardOverlayView).getEnterAnimation();

        verify(mClipboardOverlayView, never()).setMinimized(false);

        verify(mClipboardOverlayView, never()).showTextPreview(any(), anyBoolean());