Commit a7e95b12 authored by Sammie Quon's avatar Sammie Quon Committed by Commit Bot

splitview: Do not show indicators when already snapped window.

Test: manual
Bug: 824868
Change-Id: I9d008311447215bce541a7c294b451470a0c5aac
Reviewed-on: https://chromium-review.googlesource.com/978451Reviewed-by: default avatarXiaoqian Dai <xdai@chromium.org>
Commit-Queue: Sammie Quon <sammiequon@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545635}
parent e8efd093
...@@ -247,12 +247,13 @@ class SplitViewDragIndicators::SplitViewDragIndicatorsView ...@@ -247,12 +247,13 @@ class SplitViewDragIndicators::SplitViewDragIndicatorsView
? IDS_ASH_SPLIT_VIEW_CANNOT_SNAP ? IDS_ASH_SPLIT_VIEW_CANNOT_SNAP
: IDS_ASH_SPLIT_VIEW_GUIDANCE)); : IDS_ASH_SPLIT_VIEW_GUIDANCE));
SplitviewAnimationType animation_type; SplitviewAnimationType animation_type;
if (IsPreviewAreaState(previous_indicator_state_)) { if (!show) {
animation_type = SPLITVIEW_ANIMATION_TEXT_FADE_IN; animation_type = SPLITVIEW_ANIMATION_TEXT_FADE_OUT_WITH_HIGHLIGHT;
} else { } else {
animation_type = animation_type =
show ? SPLITVIEW_ANIMATION_TEXT_FADE_IN_WITH_HIGHLIGHT IsPreviewAreaState(previous_indicator_state_)
: SPLITVIEW_ANIMATION_TEXT_FADE_OUT_WITH_HIGHLIGHT; ? SPLITVIEW_ANIMATION_TEXT_FADE_IN_WITH_HIGHLIGHT
: SPLITVIEW_ANIMATION_TEXT_FADE_IN;
} }
DoSplitviewOpacityAnimation(view->layer(), animation_type); DoSplitviewOpacityAnimation(view->layer(), animation_type);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment