Skip to content
Snippets Groups Projects
Commit 73f93863 authored by Miranda Kephart's avatar Miranda Kephart
Browse files

Animate in clipboard minimized view

Bug: 308741340
Fix: 308741340
Test: manual; test clipboard overlay with keyboard up and verify it
appears
Test: atest ClipboardOverlayControllerTest
Flag: NONE

Change-Id: I56a1b328f645bd5c76264f6b3b94abbf7eef8f04
parent 2a6f13a9
No related branches found
No related tags found
No related merge requests found
......@@ -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) {
......
......@@ -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());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment