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

Commit e48f428b authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Restore changes lost during merge 

Change-Id: I619be025988470e27b614ed0ad009e5d785f19eb
parent dcf467ca

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

+7 −0
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ import com.android.systemui.R; 
import com.android.systemui.stackdivider.DividerSnapAlgorithm.SnapTarget;

import com.android.systemui.statusbar.FlingAnimationUtils;



import static android.view.PointerIcon.STYLE_HORIZONTAL_DOUBLE_ARROW;

import static android.view.PointerIcon.STYLE_VERTICAL_DOUBLE_ARROW;



/**

 * Docked stack divider.

 */
@@ -111,6 +114,10 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
                android.R.interpolator.fast_out_slow_in);

        mFlingAnimationUtils = new FlingAnimationUtils(getContext(), 0.3f);

        updateDisplayInfo();

        boolean landscape = getResources().getConfiguration().orientation

                == Configuration.ORIENTATION_LANDSCAPE;

        mHandle.setPointerShape(

                landscape ? STYLE_HORIZONTAL_DOUBLE_ARROW : STYLE_VERTICAL_DOUBLE_ARROW);

        getViewTreeObserver().addOnComputeInternalInsetsListener(this);

    }

services/core/java/com/android/server/wm/DockedStackDividerController.java

+3 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.wm; 
import android.content.Context;

import android.graphics.Rect;



import static android.app.ActivityManager.StackId.DOCKED_STACK_ID;

import static android.view.WindowManager.DOCKED_BOTTOM;

import static android.view.WindowManager.DOCKED_LEFT;

import static android.view.WindowManager.DOCKED_RIGHT;
@@ -65,8 +66,8 @@ public class DockedStackDividerController { 


    void reevaluateVisibility() {

        if (mWindow == null) return;

        boolean visible = mDisplayContent.getDockedStackLocked() != null;

        if (visible) {

        TaskStack stack = mDisplayContent.mService.mStackIdToStack.get(DOCKED_STACK_ID);

        if (stack != null && stack.isVisibleLocked()) {

            mWindow.showLw(true /* doAnimation */);

        } else {

            mWindow.hideLw(true /* doAnimation */);