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

Commit ef48ae83 authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Minimal change to ensure that position is last saved when docking."... 

Merge "Minimal change to ensure that position is last saved when docking." into oc-mr1-dev am: 1ca7d063
am: 4726b4e8

Change-Id: I3264b0a59ab9ff1b4b1d9ac0e66236e83c1bacd6
parents c014a7f1 4726b4e8

packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java

+5 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ import com.android.systemui.Interpolators; 
import com.android.systemui.R;

import com.android.systemui.recents.Recents;

import com.android.systemui.recents.events.EventBus;

import com.android.systemui.recents.events.activity.DockedFirstAnimationFrameEvent;

import com.android.systemui.recents.events.activity.DockedTopTaskEvent;

import com.android.systemui.recents.events.activity.RecentsActivityStartingEvent;

import com.android.systemui.recents.events.activity.UndockingTaskEvent;
@@ -1192,6 +1193,10 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
        }

    }



    public final void onBusEvent(DockedFirstAnimationFrameEvent event) {

        saveSnapTargetBeforeMinimized(mSnapAlgorithm.getMiddleTarget());

    }



    public final void onBusEvent(DockedTopTaskEvent event) {

        if (event.dragMode == NavigationBarGestureHelper.DRAG_MODE_NONE) {

            mState.growAfterRecentsDrawn = false;