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

Commit 2afe5ce7 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Fix IME adjust in SysUI" into nyc-dev am: 54d056ed 

am: 8364ebd4

* commit '8364ebd4':
  Fix IME adjust in SysUI

Change-Id: Ibc89830dfd4396439e0627de971868fd7bd64863
parents 614aaac0 8364ebd4

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

+6 −5
Original line number Original line Diff line number Diff line
@@ -32,7 +32,6 @@ import android.graphics.Region.Op; 
import android.hardware.display.DisplayManager;

import android.hardware.display.DisplayManager;

import android.os.Bundle;

import android.os.Bundle;

import android.util.AttributeSet;

import android.util.AttributeSet;

import android.util.MutableInt;

import android.view.Display;

import android.view.Display;

import android.view.DisplayInfo;

import android.view.DisplayInfo;

import android.view.GestureDetector;

import android.view.GestureDetector;
@@ -105,6 +104,8 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
            new PathInterpolator(0.5f, 1f, 0.5f, 1f);

            new PathInterpolator(0.5f, 1f, 0.5f, 1f);

    private static final PathInterpolator DIM_INTERPOLATOR =

    private static final PathInterpolator DIM_INTERPOLATOR =

            new PathInterpolator(.23f, .87f, .52f, -0.11f);

            new PathInterpolator(.23f, .87f, .52f, -0.11f);

    private static final Interpolator IME_ADJUST_INTERPOLATOR =

            new PathInterpolator(0.2f, 0f, 0.1f, 1f);





    private DividerHandleView mHandle;

    private DividerHandleView mHandle;

    private View mBackground;

    private View mBackground;
@@ -701,7 +702,7 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
            resetBackground();

            resetBackground();

        } else if (mDockSide == WindowManager.DOCKED_TOP) {

        } else if (mDockSide == WindowManager.DOCKED_TOP) {

            mBackground.setPivotY(0);

            mBackground.setPivotY(0);

            mBackground.setScaleY(MINIMIZE_DOCK_SCALE);

            mBackground.setScaleY(ADJUSTED_FOR_IME_SCALE);

        }

        }

        mAdjustedForIme = adjustedForIme;

        mAdjustedForIme = adjustedForIme;

    }

    }
@@ -709,20 +710,20 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
    public void setAdjustedForIme(boolean adjustedForIme, long animDuration) {

    public void setAdjustedForIme(boolean adjustedForIme, long animDuration) {

        updateDockSide();

        updateDockSide();

        mHandle.animate()

        mHandle.animate()

                .setInterpolator(Interpolators.FAST_OUT_SLOW_IN)

                .setInterpolator(IME_ADJUST_INTERPOLATOR)

                .setDuration(animDuration)

                .setDuration(animDuration)

                .alpha(adjustedForIme ? 0f : 1f)

                .alpha(adjustedForIme ? 0f : 1f)

                .start();

                .start();

        if (mDockSide == WindowManager.DOCKED_TOP) {

        if (mDockSide == WindowManager.DOCKED_TOP) {

            mBackground.setPivotY(0);

            mBackground.setPivotY(0);

            mBackground.animate()

            mBackground.animate()

                    .scaleY(adjustedForIme ? MINIMIZE_DOCK_SCALE : 1f);

                    .scaleY(adjustedForIme ? ADJUSTED_FOR_IME_SCALE : 1f);

        }

        }

        if (!adjustedForIme) {

        if (!adjustedForIme) {

            mBackground.animate().withEndAction(mResetBackgroundRunnable);

            mBackground.animate().withEndAction(mResetBackgroundRunnable);

        }

        }

        mBackground.animate()

        mBackground.animate()

                .setInterpolator(Interpolators.FAST_OUT_SLOW_IN)

                .setInterpolator(IME_ADJUST_INTERPOLATOR)

                .setDuration(animDuration)

                .setDuration(animDuration)

                .start();

                .start();

        mAdjustedForIme = adjustedForIme;

        mAdjustedForIme = adjustedForIme;