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

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

Merge "Add clipboard logs for minimized UI" into udc-dev

parents b3985501 27074248

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

+9 −1
Original line number Diff line number Diff line
@@ -24,8 +24,11 @@ import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBO 
import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_DISMISSED_OTHER;

import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_DISMISS_TAPPED;

import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_EDIT_TAPPED;

import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_EXPANDED_FROM_MINIMIZED;

import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_REMOTE_COPY_TAPPED;

import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_SHARE_TAPPED;

import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_SHOWN_EXPANDED;

import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_SHOWN_MINIMIZED;

import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_SWIPE_DISMISSED;

import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_TAP_OUTSIDE;

import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_TIMED_OUT;
@@ -274,9 +277,11 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv 
            reset();

            mClipboardLogger.setClipSource(mClipboardModel.getSource());

            if (shouldShowMinimized(mWindow.getWindowInsets())) {

                mClipboardLogger.logUnguarded(CLIPBOARD_OVERLAY_SHOWN_MINIMIZED);

                mIsMinimized = true;

                mView.setMinimized(true);

            } else {

                mClipboardLogger.logUnguarded(CLIPBOARD_OVERLAY_SHOWN_EXPANDED);

                setExpandedView();

            }

            animateIn();
@@ -359,7 +364,10 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv 
            @Override

            public void onAnimationEnd(Animator animation) {

                super.onAnimationEnd(animation);

                if (mIsMinimized) {

                    mClipboardLogger.logUnguarded(CLIPBOARD_OVERLAY_EXPANDED_FROM_MINIMIZED);

                    mIsMinimized = false;

                }

                setExpandedView();

                animateIn();

            }

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

+6 −0
Original line number Diff line number Diff line
@@ -44,6 +44,12 @@ public enum ClipboardOverlayEvent implements UiEventLogger.UiEventEnum { 
    CLIPBOARD_OVERLAY_TAP_OUTSIDE(1077),

    @UiEvent(doc = "clipboard overlay dismissed, miscellaneous reason")

    CLIPBOARD_OVERLAY_DISMISSED_OTHER(1078),

    @UiEvent(doc = "clipboard overlay shown in expanded form")

    CLIPBOARD_OVERLAY_SHOWN_EXPANDED(1356),

    @UiEvent(doc = "clipboard overlay shown in minimized form")

    CLIPBOARD_OVERLAY_SHOWN_MINIMIZED(1357),

    @UiEvent(doc = "clipboard overlay expanded")

    CLIPBOARD_OVERLAY_EXPANDED_FROM_MINIMIZED(1358),

    @UiEvent(doc = "clipboard toast shown")

    CLIPBOARD_TOAST_SHOWN(1270);

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

+12 −2
Original line number Diff line number Diff line
@@ -20,7 +20,10 @@ import static android.content.res.Configuration.ORIENTATION_PORTRAIT; 


import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_ACTION_SHOWN;

import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_DISMISS_TAPPED;

import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_EXPANDED_FROM_MINIMIZED;

import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_SHARE_TAPPED;

import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_SHOWN_EXPANDED;

import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_SHOWN_MINIMIZED;

import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_SWIPE_DISMISSED;

import static com.android.systemui.flags.Flags.CLIPBOARD_MINIMIZED_LAYOUT;

import static com.android.systemui.flags.Flags.CLIPBOARD_REMOTE_BEHAVIOR;
@@ -340,9 +343,10 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase { 


    @Test

    public void test_setClipData_textData() {

        mOverlayController.setClipData(mSampleClipData, "");

        mOverlayController.setClipData(mSampleClipData, "abc");



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

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

        verify(mClipboardOverlayView, times(1)).showShareChip();

        verify(mClipboardOverlayView, times(1)).getEnterAnimation();

    }
@@ -440,6 +444,8 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase { 


        verify(mUiEventLogger).log(CLIPBOARD_OVERLAY_DISMISS_TAPPED, 0, "first.package");

        verify(mUiEventLogger).log(CLIPBOARD_OVERLAY_DISMISS_TAPPED, 0, "second.package");

        verify(mUiEventLogger).log(CLIPBOARD_OVERLAY_SHOWN_EXPANDED, 0, "first.package");

        verify(mUiEventLogger).log(CLIPBOARD_OVERLAY_SHOWN_EXPANDED, 0, "second.package");

        verifyNoMoreInteractions(mUiEventLogger);

    }
@@ -465,6 +471,7 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase { 
        mExecutor.runAllReady();



        verify(mUiEventLogger).log(CLIPBOARD_OVERLAY_ACTION_SHOWN, 0, "actionShownSource");

        verify(mUiEventLogger).log(CLIPBOARD_OVERLAY_SHOWN_EXPANDED, 0, "actionShownSource");

        verifyNoMoreInteractions(mUiEventLogger);

    }
@@ -481,11 +488,12 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase { 
    public void test_insets_showsMinimized() {

        when(mClipboardOverlayWindow.getWindowInsets()).thenReturn(

                getImeInsets(new Rect(0, 0, 0, 1)));

        mOverlayController.setClipData(mSampleClipData, "");

        mOverlayController.setClipData(mSampleClipData, "abc");

        Animator mockFadeoutAnimator = Mockito.mock(Animator.class);

        when(mClipboardOverlayView.getMinimizedFadeoutAnimation()).thenReturn(mockFadeoutAnimator);



        verify(mClipboardOverlayView).setMinimized(true);

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

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

        verify(mClipboardOverlayView, never()).showTextPreview(any(), anyBoolean());
@@ -495,6 +503,8 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase { 


        verify(mClipboardOverlayView).setMinimized(false);

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

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

        verify(mUiEventLogger, never()).log(CLIPBOARD_OVERLAY_SHOWN_EXPANDED, 0, "abc");

    }



    @Test