mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-19 10:48:19 +00:00
Merge "Show tooltips on cursor hover of taskbar icons." into udc-qpr-dev
This commit is contained in:
@@ -298,4 +298,9 @@
|
||||
<style name="rotate_prompt_subtitle" parent="TextAppearance.GestureTutorial.Dialog.Subtitle">
|
||||
<item name="android:textColor">?androidprv:attr/materialColorOnSurfaceVariant</item>
|
||||
</style>
|
||||
|
||||
<style name="ArrowTipTaskbarStyle">
|
||||
<item name="arrowTipBackground">?androidprv:attr/materialColorSurfaceContainer</item>
|
||||
<item name="arrowTipTextColor">?androidprv:attr/materialColorOnSurface</item>
|
||||
</style>
|
||||
</resources>
|
||||
|
||||
@@ -45,6 +45,8 @@ public class TaskbarAutohideSuspendController implements
|
||||
public static final int FLAG_AUTOHIDE_SUSPEND_IN_LAUNCHER = 1 << 4;
|
||||
// Transient Taskbar is temporarily unstashed (pending a timeout).
|
||||
public static final int FLAG_AUTOHIDE_SUSPEND_TRANSIENT_TASKBAR = 1 << 5;
|
||||
// User has hovered the taskbar.
|
||||
public static final int FLAG_AUTOHIDE_SUSPEND_HOVERING_ICONS = 1 << 6;
|
||||
|
||||
@IntDef(flag = true, value = {
|
||||
FLAG_AUTOHIDE_SUSPEND_FULLSCREEN,
|
||||
@@ -53,6 +55,7 @@ public class TaskbarAutohideSuspendController implements
|
||||
FLAG_AUTOHIDE_SUSPEND_EDU_OPEN,
|
||||
FLAG_AUTOHIDE_SUSPEND_IN_LAUNCHER,
|
||||
FLAG_AUTOHIDE_SUSPEND_TRANSIENT_TASKBAR,
|
||||
FLAG_AUTOHIDE_SUSPEND_HOVERING_ICONS,
|
||||
})
|
||||
@Retention(RetentionPolicy.SOURCE)
|
||||
public @interface AutohideSuspendFlag {}
|
||||
|
||||
@@ -0,0 +1,175 @@
|
||||
/*
|
||||
* Copyright (C) 2023 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package com.android.launcher3.taskbar;
|
||||
|
||||
import static android.view.MotionEvent.ACTION_HOVER_ENTER;
|
||||
import static android.view.MotionEvent.ACTION_HOVER_EXIT;
|
||||
import static android.view.View.ALPHA;
|
||||
import static android.view.View.SCALE_Y;
|
||||
import static android.view.accessibility.AccessibilityManager.FLAG_CONTENT_TEXT;
|
||||
|
||||
import static com.android.app.animation.Interpolators.LINEAR;
|
||||
import static com.android.launcher3.AbstractFloatingView.TYPE_ALL_EXCEPT_ON_BOARD_POPUP;
|
||||
import static com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_HOVERING_ICONS;
|
||||
import static com.android.launcher3.views.ArrowTipView.TEXT_ALPHA;
|
||||
|
||||
import android.animation.AnimatorSet;
|
||||
import android.animation.ObjectAnimator;
|
||||
import android.graphics.Rect;
|
||||
import android.os.Handler;
|
||||
import android.os.Looper;
|
||||
import android.view.ContextThemeWrapper;
|
||||
import android.view.MotionEvent;
|
||||
import android.view.View;
|
||||
|
||||
import com.android.app.animation.Interpolators;
|
||||
import com.android.launcher3.AbstractFloatingView;
|
||||
import com.android.launcher3.BubbleTextView;
|
||||
import com.android.launcher3.R;
|
||||
import com.android.launcher3.Utilities;
|
||||
import com.android.launcher3.compat.AccessibilityManagerCompat;
|
||||
import com.android.launcher3.folder.FolderIcon;
|
||||
import com.android.launcher3.views.ArrowTipView;
|
||||
|
||||
/**
|
||||
* Controls showing a tooltip in the taskbar above each icon when it is hovered.
|
||||
*/
|
||||
public class TaskbarHoverToolTipController implements View.OnHoverListener {
|
||||
|
||||
private static final int HOVER_TOOL_TIP_REVEAL_START_DELAY = 400;
|
||||
private static final int HOVER_TOOL_TIP_REVEAL_DURATION = 300;
|
||||
private static final int HOVER_TOOL_TIP_EXIT_DURATION = 150;
|
||||
|
||||
private final Handler mHoverToolTipHandler = new Handler(Looper.getMainLooper());
|
||||
private final Runnable mRevealHoverToolTipRunnable = this::revealHoverToolTip;
|
||||
private final Runnable mHideHoverToolTipRunnable = this::hideHoverToolTip;
|
||||
|
||||
private final TaskbarActivityContext mActivity;
|
||||
private final TaskbarView mTaskbarView;
|
||||
private final View mHoverView;
|
||||
private final ArrowTipView mHoverToolTipView;
|
||||
private final String mToolTipText;
|
||||
|
||||
public TaskbarHoverToolTipController(TaskbarActivityContext activity, TaskbarView taskbarView,
|
||||
View hoverView) {
|
||||
mActivity = activity;
|
||||
mTaskbarView = taskbarView;
|
||||
mHoverView = hoverView;
|
||||
|
||||
if (mHoverView instanceof BubbleTextView) {
|
||||
mToolTipText = ((BubbleTextView) mHoverView).getText().toString();
|
||||
} else if (mHoverView instanceof FolderIcon
|
||||
&& ((FolderIcon) mHoverView).mInfo.title != null) {
|
||||
mToolTipText = ((FolderIcon) mHoverView).mInfo.title.toString();
|
||||
} else {
|
||||
mToolTipText = null;
|
||||
}
|
||||
|
||||
ContextThemeWrapper arrowContextWrapper = new ContextThemeWrapper(mActivity,
|
||||
R.style.ArrowTipTaskbarStyle);
|
||||
mHoverToolTipView = new ArrowTipView(arrowContextWrapper, /* isPointingUp = */ false,
|
||||
R.layout.arrow_toast);
|
||||
|
||||
AnimatorSet hoverCloseAnimator = new AnimatorSet();
|
||||
ObjectAnimator textCloseAnimator = ObjectAnimator.ofInt(mHoverToolTipView, TEXT_ALPHA, 0);
|
||||
textCloseAnimator.setInterpolator(Interpolators.clampToProgress(LINEAR, 0, 0.33f));
|
||||
ObjectAnimator alphaCloseAnimator = ObjectAnimator.ofFloat(mHoverToolTipView, ALPHA, 0);
|
||||
alphaCloseAnimator.setInterpolator(Interpolators.clampToProgress(LINEAR, 0.33f, 0.66f));
|
||||
ObjectAnimator scaleCloseAnimator = ObjectAnimator.ofFloat(mHoverToolTipView, SCALE_Y, 0);
|
||||
scaleCloseAnimator.setInterpolator(Interpolators.STANDARD);
|
||||
hoverCloseAnimator.playTogether(
|
||||
textCloseAnimator,
|
||||
alphaCloseAnimator,
|
||||
scaleCloseAnimator);
|
||||
hoverCloseAnimator.setStartDelay(0);
|
||||
hoverCloseAnimator.setDuration(HOVER_TOOL_TIP_EXIT_DURATION);
|
||||
mHoverToolTipView.setCustomCloseAnimation(hoverCloseAnimator);
|
||||
|
||||
AnimatorSet hoverOpenAnimator = new AnimatorSet();
|
||||
ObjectAnimator textOpenAnimator = ObjectAnimator.ofInt(mHoverToolTipView, TEXT_ALPHA, 255);
|
||||
textOpenAnimator.setInterpolator(Interpolators.clampToProgress(LINEAR, 0.33f, 1f));
|
||||
ObjectAnimator scaleOpenAnimator = ObjectAnimator.ofFloat(mHoverToolTipView, SCALE_Y, 1f);
|
||||
scaleOpenAnimator.setInterpolator(Interpolators.EMPHASIZED);
|
||||
ObjectAnimator alphaOpenAnimator = ObjectAnimator.ofFloat(mHoverToolTipView, ALPHA, 1f);
|
||||
alphaOpenAnimator.setInterpolator(Interpolators.clampToProgress(LINEAR, 0.1f, 0.33f));
|
||||
hoverOpenAnimator.playTogether(
|
||||
scaleOpenAnimator,
|
||||
textOpenAnimator,
|
||||
alphaOpenAnimator);
|
||||
hoverOpenAnimator.setStartDelay(HOVER_TOOL_TIP_REVEAL_START_DELAY);
|
||||
hoverOpenAnimator.setDuration(HOVER_TOOL_TIP_REVEAL_DURATION);
|
||||
mHoverToolTipView.setCustomOpenAnimation(hoverOpenAnimator);
|
||||
|
||||
mHoverToolTipView.addOnLayoutChangeListener(
|
||||
(v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
|
||||
mHoverToolTipView.setPivotY(bottom);
|
||||
mHoverToolTipView.setY(mTaskbarView.getTop() - (bottom - top));
|
||||
});
|
||||
mHoverToolTipView.setScaleY(0f);
|
||||
mHoverToolTipView.setAlpha(0f);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onHover(View v, MotionEvent event) {
|
||||
boolean isAnyOtherFloatingViewOpen =
|
||||
AbstractFloatingView.hasOpenView(mActivity, TYPE_ALL_EXCEPT_ON_BOARD_POPUP);
|
||||
if (isAnyOtherFloatingViewOpen) {
|
||||
mHoverToolTipHandler.removeCallbacksAndMessages(null);
|
||||
}
|
||||
// If hover leaves a taskbar icon animate the tooltip closed.
|
||||
if (event.getAction() == ACTION_HOVER_EXIT) {
|
||||
startHideHoverToolTip();
|
||||
mActivity.setAutohideSuspendFlag(FLAG_AUTOHIDE_SUSPEND_HOVERING_ICONS, false);
|
||||
return true;
|
||||
} else if (!isAnyOtherFloatingViewOpen && event.getAction() == ACTION_HOVER_ENTER) {
|
||||
// If hovering above a taskbar icon starts, animate the tooltip open. Do not
|
||||
// reveal if any floating views such as folders or edu pop-ups are open.
|
||||
startRevealHoverToolTip();
|
||||
mActivity.setAutohideSuspendFlag(FLAG_AUTOHIDE_SUSPEND_HOVERING_ICONS, true);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private void startRevealHoverToolTip() {
|
||||
mActivity.setTaskbarWindowFullscreen(true);
|
||||
mHoverToolTipHandler.postDelayed(mRevealHoverToolTipRunnable,
|
||||
HOVER_TOOL_TIP_REVEAL_START_DELAY);
|
||||
}
|
||||
|
||||
private void revealHoverToolTip() {
|
||||
if (mHoverView == null || mToolTipText == null) {
|
||||
return;
|
||||
}
|
||||
if (mHoverView instanceof FolderIcon && !((FolderIcon) mHoverView).getIconVisible()) {
|
||||
return;
|
||||
}
|
||||
Rect iconViewBounds = Utilities.getViewBounds(mHoverView);
|
||||
mHoverToolTipView.showAtLocation(mToolTipText, iconViewBounds.centerX(),
|
||||
mTaskbarView.getTop(), /* shouldAutoClose= */ false);
|
||||
}
|
||||
|
||||
private void startHideHoverToolTip() {
|
||||
mHoverToolTipHandler.removeCallbacks(mRevealHoverToolTipRunnable);
|
||||
int accessibilityHideTimeout = AccessibilityManagerCompat.getRecommendedTimeoutMillis(
|
||||
mActivity, /* originalTimeout= */ 0, FLAG_CONTENT_TEXT);
|
||||
mHoverToolTipHandler.postDelayed(mHideHoverToolTipRunnable, accessibilityHideTimeout);
|
||||
}
|
||||
|
||||
private void hideHoverToolTip() {
|
||||
mHoverToolTipView.close(/* animate = */ true);
|
||||
}
|
||||
}
|
||||
@@ -18,6 +18,7 @@ package com.android.launcher3.taskbar;
|
||||
import static android.content.pm.PackageManager.FEATURE_PC;
|
||||
import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED;
|
||||
|
||||
import static com.android.launcher3.config.FeatureFlags.ENABLE_CURSOR_HOVER_STATES;
|
||||
import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR;
|
||||
|
||||
import android.content.Context;
|
||||
@@ -319,6 +320,9 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
|
||||
}
|
||||
}
|
||||
setClickAndLongClickListenersForIcon(hotseatView);
|
||||
if (ENABLE_CURSOR_HOVER_STATES.get()) {
|
||||
setHoverListenerForIcon(hotseatView);
|
||||
}
|
||||
nextViewIndex++;
|
||||
}
|
||||
// Remove remaining views
|
||||
@@ -366,6 +370,13 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
|
||||
icon.setOnLongClickListener(mIconLongClickListener);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets OnHoverListener for the given view.
|
||||
*/
|
||||
private void setHoverListenerForIcon(View icon) {
|
||||
icon.setOnHoverListener(mControllerCallbacks.getIconOnHoverListener(icon));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
|
||||
int count = getChildCount();
|
||||
|
||||
@@ -690,6 +690,11 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
|
||||
.updateAndAnimateIsManuallyStashedInApp(true);
|
||||
}
|
||||
|
||||
/** Gets the hover listener for the provided icon view. */
|
||||
public View.OnHoverListener getIconOnHoverListener(View icon) {
|
||||
return new TaskbarHoverToolTipController(mActivity, mTaskbarView, icon);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the first chance to handle TaskbarView#onTouchEvent, and return whether we want to
|
||||
* consume the touch so TaskbarView treats it as an ACTION_CANCEL.
|
||||
|
||||
@@ -0,0 +1,221 @@
|
||||
/*
|
||||
* Copyright (C) 2023 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package com.android.launcher3.taskbar;
|
||||
|
||||
import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
|
||||
|
||||
import static com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_HOVERING_ICONS;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyInt;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.Mockito.doAnswer;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
import android.testing.AndroidTestingRunner;
|
||||
import android.testing.TestableLooper;
|
||||
import android.view.Display;
|
||||
import android.view.MotionEvent;
|
||||
|
||||
import androidx.test.filters.SmallTest;
|
||||
|
||||
import com.android.launcher3.BubbleTextView;
|
||||
import com.android.launcher3.folder.Folder;
|
||||
import com.android.launcher3.folder.FolderIcon;
|
||||
import com.android.launcher3.model.data.FolderInfo;
|
||||
import com.android.launcher3.util.ActivityContextWrapper;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.mockito.stubbing.Answer;
|
||||
|
||||
/**
|
||||
* Tests for TaskbarHoverToolTipController.
|
||||
*/
|
||||
@SmallTest
|
||||
@RunWith(AndroidTestingRunner.class)
|
||||
@TestableLooper.RunWithLooper
|
||||
public class TaskbarHoverToolTipControllerTest extends TaskbarBaseTestCase {
|
||||
|
||||
private TaskbarHoverToolTipController mTaskbarHoverToolTipController;
|
||||
private TestableLooper mTestableLooper;
|
||||
|
||||
@Mock private TaskbarView mTaskbarView;
|
||||
@Mock private MotionEvent mMotionEvent;
|
||||
@Mock private BubbleTextView mHoverBubbleTextView;
|
||||
@Mock private FolderIcon mHoverFolderIcon;
|
||||
@Mock private Display mDisplay;
|
||||
@Mock private TaskbarDragLayer mTaskbarDragLayer;
|
||||
private Folder mSpyFolderView;
|
||||
|
||||
@Before
|
||||
public void setup() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
|
||||
Context context = getApplicationContext();
|
||||
|
||||
doAnswer((Answer<Object>) invocation -> context.getSystemService(
|
||||
(String) invocation.getArgument(0)))
|
||||
.when(taskbarActivityContext).getSystemService(anyString());
|
||||
when(taskbarActivityContext.getResources()).thenReturn(context.getResources());
|
||||
when(taskbarActivityContext.getApplicationInfo()).thenReturn(
|
||||
context.getApplicationInfo());
|
||||
when(taskbarActivityContext.getDragLayer()).thenReturn(mTaskbarDragLayer);
|
||||
when(taskbarActivityContext.getMainLooper()).thenReturn(context.getMainLooper());
|
||||
when(taskbarActivityContext.getDisplay()).thenReturn(mDisplay);
|
||||
|
||||
when(mTaskbarDragLayer.getChildCount()).thenReturn(1);
|
||||
mSpyFolderView = spy(new Folder(new ActivityContextWrapper(context), null));
|
||||
when(mTaskbarDragLayer.getChildAt(anyInt())).thenReturn(mSpyFolderView);
|
||||
doReturn(false).when(mSpyFolderView).isOpen();
|
||||
|
||||
when(mHoverBubbleTextView.getText()).thenReturn("tooltip");
|
||||
doAnswer((Answer<Void>) invocation -> {
|
||||
Object[] args = invocation.getArguments();
|
||||
((int[]) args[0])[0] = 0;
|
||||
((int[]) args[0])[1] = 0;
|
||||
return null;
|
||||
}).when(mHoverBubbleTextView).getLocationOnScreen(any(int[].class));
|
||||
when(mHoverBubbleTextView.getWidth()).thenReturn(100);
|
||||
when(mHoverBubbleTextView.getHeight()).thenReturn(100);
|
||||
|
||||
mHoverFolderIcon.mInfo = new FolderInfo();
|
||||
mHoverFolderIcon.mInfo.title = "tooltip";
|
||||
doAnswer((Answer<Void>) invocation -> {
|
||||
Object[] args = invocation.getArguments();
|
||||
((int[]) args[0])[0] = 0;
|
||||
((int[]) args[0])[1] = 0;
|
||||
return null;
|
||||
}).when(mHoverFolderIcon).getLocationOnScreen(any(int[].class));
|
||||
when(mHoverFolderIcon.getWidth()).thenReturn(100);
|
||||
when(mHoverFolderIcon.getHeight()).thenReturn(100);
|
||||
|
||||
when(mTaskbarView.getTop()).thenReturn(200);
|
||||
|
||||
mTaskbarHoverToolTipController = new TaskbarHoverToolTipController(
|
||||
taskbarActivityContext, mTaskbarView, mHoverBubbleTextView);
|
||||
mTestableLooper = TestableLooper.get(this);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onHover_hoverEnterIcon_revealToolTip() {
|
||||
when(mMotionEvent.getAction()).thenReturn(MotionEvent.ACTION_HOVER_ENTER);
|
||||
when(mMotionEvent.getActionMasked()).thenReturn(MotionEvent.ACTION_HOVER_ENTER);
|
||||
|
||||
boolean hoverHandled =
|
||||
mTaskbarHoverToolTipController.onHover(mHoverBubbleTextView, mMotionEvent);
|
||||
waitForIdleSync();
|
||||
|
||||
assertThat(hoverHandled).isTrue();
|
||||
verify(taskbarActivityContext).setAutohideSuspendFlag(FLAG_AUTOHIDE_SUSPEND_HOVERING_ICONS,
|
||||
true);
|
||||
verify(taskbarActivityContext).setTaskbarWindowFullscreen(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onHover_hoverExitIcon_closeToolTip() {
|
||||
when(mMotionEvent.getAction()).thenReturn(MotionEvent.ACTION_HOVER_EXIT);
|
||||
when(mMotionEvent.getActionMasked()).thenReturn(MotionEvent.ACTION_HOVER_EXIT);
|
||||
|
||||
boolean hoverHandled =
|
||||
mTaskbarHoverToolTipController.onHover(mHoverBubbleTextView, mMotionEvent);
|
||||
waitForIdleSync();
|
||||
|
||||
assertThat(hoverHandled).isTrue();
|
||||
verify(taskbarActivityContext).setAutohideSuspendFlag(FLAG_AUTOHIDE_SUSPEND_HOVERING_ICONS,
|
||||
false);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onHover_hoverEnterFolderIcon_revealToolTip() {
|
||||
when(mMotionEvent.getAction()).thenReturn(MotionEvent.ACTION_HOVER_ENTER);
|
||||
when(mMotionEvent.getActionMasked()).thenReturn(MotionEvent.ACTION_HOVER_ENTER);
|
||||
|
||||
boolean hoverHandled =
|
||||
mTaskbarHoverToolTipController.onHover(mHoverFolderIcon, mMotionEvent);
|
||||
waitForIdleSync();
|
||||
|
||||
assertThat(hoverHandled).isTrue();
|
||||
verify(taskbarActivityContext).setAutohideSuspendFlag(FLAG_AUTOHIDE_SUSPEND_HOVERING_ICONS,
|
||||
true);
|
||||
verify(taskbarActivityContext).setTaskbarWindowFullscreen(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onHover_hoverExitFolderIcon_closeToolTip() {
|
||||
when(mMotionEvent.getAction()).thenReturn(MotionEvent.ACTION_HOVER_EXIT);
|
||||
when(mMotionEvent.getActionMasked()).thenReturn(MotionEvent.ACTION_HOVER_EXIT);
|
||||
|
||||
boolean hoverHandled =
|
||||
mTaskbarHoverToolTipController.onHover(mHoverFolderIcon, mMotionEvent);
|
||||
waitForIdleSync();
|
||||
|
||||
assertThat(hoverHandled).isTrue();
|
||||
verify(taskbarActivityContext).setAutohideSuspendFlag(FLAG_AUTOHIDE_SUSPEND_HOVERING_ICONS,
|
||||
false);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onHover_hoverExitFolderOpen_closeToolTip() {
|
||||
when(mMotionEvent.getAction()).thenReturn(MotionEvent.ACTION_HOVER_EXIT);
|
||||
when(mMotionEvent.getActionMasked()).thenReturn(MotionEvent.ACTION_HOVER_EXIT);
|
||||
doReturn(true).when(mSpyFolderView).isOpen();
|
||||
|
||||
boolean hoverHandled =
|
||||
mTaskbarHoverToolTipController.onHover(mHoverFolderIcon, mMotionEvent);
|
||||
waitForIdleSync();
|
||||
|
||||
assertThat(hoverHandled).isTrue();
|
||||
verify(taskbarActivityContext).setAutohideSuspendFlag(FLAG_AUTOHIDE_SUSPEND_HOVERING_ICONS,
|
||||
false);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onHover_hoverEnterFolderOpen_noToolTip() {
|
||||
when(mMotionEvent.getAction()).thenReturn(MotionEvent.ACTION_HOVER_ENTER);
|
||||
when(mMotionEvent.getActionMasked()).thenReturn(MotionEvent.ACTION_HOVER_ENTER);
|
||||
doReturn(true).when(mSpyFolderView).isOpen();
|
||||
|
||||
boolean hoverHandled =
|
||||
mTaskbarHoverToolTipController.onHover(mHoverFolderIcon, mMotionEvent);
|
||||
|
||||
assertThat(hoverHandled).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onHover_hoverMove_noUpdate() {
|
||||
when(mMotionEvent.getAction()).thenReturn(MotionEvent.ACTION_HOVER_MOVE);
|
||||
when(mMotionEvent.getActionMasked()).thenReturn(MotionEvent.ACTION_HOVER_MOVE);
|
||||
|
||||
boolean hoverHandled =
|
||||
mTaskbarHoverToolTipController.onHover(mHoverFolderIcon, mMotionEvent);
|
||||
|
||||
assertThat(hoverHandled).isFalse();
|
||||
}
|
||||
|
||||
private void waitForIdleSync() {
|
||||
mTestableLooper.processAllMessages();
|
||||
}
|
||||
}
|
||||
@@ -14,6 +14,6 @@
|
||||
limitations under the License.
|
||||
-->
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
|
||||
<solid android:color="@color/arrow_tip_view_bg" />
|
||||
<solid android:color="?attr/arrowTipBackground" />
|
||||
<corners android:radius="@dimen/dialogCornerRadius" />
|
||||
</shape>
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
android:padding="16dp"
|
||||
android:background="@drawable/arrow_toast_rounded_background"
|
||||
android:elevation="@dimen/arrow_toast_elevation"
|
||||
android:textColor="@color/arrow_tip_view_content"
|
||||
android:textColor="?attr/arrowTipTextColor"
|
||||
android:textSize="14sp"/>
|
||||
|
||||
<View
|
||||
|
||||
@@ -587,5 +587,6 @@
|
||||
|
||||
<declare-styleable name="ArrowTipView">
|
||||
<attr name="arrowTipBackground" format="color" />
|
||||
<attr name="arrowTipTextColor" format="color" />
|
||||
</declare-styleable>
|
||||
</resources>
|
||||
|
||||
@@ -425,5 +425,6 @@
|
||||
|
||||
<style name="ArrowTipStyle">
|
||||
<item name="arrowTipBackground">@color/arrow_tip_view_bg</item>
|
||||
<item name="arrowTipTextColor">@color/arrow_tip_view_content</item>
|
||||
</style>
|
||||
</resources>
|
||||
|
||||
@@ -133,6 +133,8 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
|
||||
public static final int TYPE_TASKBAR_OVERLAYS =
|
||||
TYPE_TASKBAR_ALL_APPS | TYPE_TASKBAR_EDUCATION_DIALOG;
|
||||
|
||||
public static final int TYPE_ALL_EXCEPT_ON_BOARD_POPUP = TYPE_ALL & ~TYPE_ON_BOARD_POPUP;
|
||||
|
||||
protected boolean mIsOpen;
|
||||
|
||||
public AbstractFloatingView(Context context, AttributeSet attrs) {
|
||||
|
||||
@@ -28,7 +28,9 @@ import android.graphics.Paint;
|
||||
import android.graphics.Rect;
|
||||
import android.graphics.drawable.ShapeDrawable;
|
||||
import android.os.Handler;
|
||||
import android.util.IntProperty;
|
||||
import android.util.Log;
|
||||
import android.view.ContextThemeWrapper;
|
||||
import android.view.Gravity;
|
||||
import android.view.MotionEvent;
|
||||
import android.view.View;
|
||||
@@ -43,6 +45,7 @@ import com.android.app.animation.Interpolators;
|
||||
import com.android.launcher3.AbstractFloatingView;
|
||||
import com.android.launcher3.DeviceProfile;
|
||||
import com.android.launcher3.R;
|
||||
import com.android.launcher3.anim.AnimatorListeners;
|
||||
import com.android.launcher3.dragndrop.DragLayer;
|
||||
import com.android.launcher3.graphics.TriangleShape;
|
||||
|
||||
@@ -57,6 +60,19 @@ public class ArrowTipView extends AbstractFloatingView {
|
||||
private static final long SHOW_DURATION_MS = 300;
|
||||
private static final long HIDE_DURATION_MS = 100;
|
||||
|
||||
public static final IntProperty<ArrowTipView> TEXT_ALPHA =
|
||||
new IntProperty<>("textAlpha") {
|
||||
@Override
|
||||
public void setValue(ArrowTipView view, int v) {
|
||||
view.setTextAlpha(v);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer get(ArrowTipView view) {
|
||||
return view.getTextAlpha();
|
||||
}
|
||||
};
|
||||
|
||||
private final ActivityContext mActivityContext;
|
||||
private final Handler mHandler = new Handler();
|
||||
private boolean mIsPointingUp;
|
||||
@@ -69,6 +85,8 @@ public class ArrowTipView extends AbstractFloatingView {
|
||||
private AnimatorSet mOpenAnimator = new AnimatorSet();
|
||||
private AnimatorSet mCloseAnimator = new AnimatorSet();
|
||||
|
||||
private int mTextAlpha;
|
||||
|
||||
public ArrowTipView(Context context) {
|
||||
this(context, false);
|
||||
}
|
||||
@@ -86,6 +104,11 @@ public class ArrowTipView extends AbstractFloatingView {
|
||||
mArrowMinOffset = context.getResources().getDimensionPixelSize(
|
||||
R.dimen.dynamic_grid_cell_border_spacing);
|
||||
TypedArray ta = context.obtainStyledAttributes(R.styleable.ArrowTipView);
|
||||
// Set style to default to avoid inflation issues with missing attributes.
|
||||
if (!ta.hasValue(R.styleable.ArrowTipView_arrowTipBackground)
|
||||
|| !ta.hasValue(R.styleable.ArrowTipView_arrowTipTextColor)) {
|
||||
context = new ContextThemeWrapper(context, R.style.ArrowTipStyle);
|
||||
}
|
||||
mArrowViewPaintColor = ta.getColor(R.styleable.ArrowTipView_arrowTipBackground,
|
||||
context.getColor(R.color.arrow_tip_view_bg));
|
||||
ta.recycle();
|
||||
@@ -110,6 +133,8 @@ public class ArrowTipView extends AbstractFloatingView {
|
||||
}
|
||||
if (mIsOpen) {
|
||||
if (animate) {
|
||||
mCloseAnimator.addListener(AnimatorListeners.forSuccessCallback(
|
||||
() -> mActivityContext.getDragLayer().removeView(this)));
|
||||
mCloseAnimator.start();
|
||||
} else {
|
||||
mCloseAnimator.cancel();
|
||||
@@ -414,4 +439,16 @@ public class ArrowTipView extends AbstractFloatingView {
|
||||
public void setCustomCloseAnimation(AnimatorSet animator) {
|
||||
mCloseAnimator = animator;
|
||||
}
|
||||
|
||||
private void setTextAlpha(int textAlpha) {
|
||||
if (mTextAlpha != textAlpha) {
|
||||
mTextAlpha = textAlpha;
|
||||
TextView textView = findViewById(R.id.text);
|
||||
textView.setTextColor(textView.getTextColors().withAlpha(mTextAlpha));
|
||||
}
|
||||
}
|
||||
|
||||
private int getTextAlpha() {
|
||||
return mTextAlpha;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -88,6 +88,7 @@ android_library {
|
||||
"launcher_log_protos_lite",
|
||||
"truth-prebuilt",
|
||||
"platform-test-rules",
|
||||
"testables",
|
||||
],
|
||||
manifest: "AndroidManifest-common.xml",
|
||||
platform_apis: true,
|
||||
|
||||
Reference in New Issue
Block a user