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

Commit 020127f8 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8704672 from 918ba0c9 to tm-release 

Change-Id: Ia926f19eaaf27064797c0538129facd774188ed2
parents de4b49de 918ba0c9

quickstep/src/com/android/quickstep/TaskViewUtils.java

+0 −3
Original line number Diff line number Diff line
@@ -514,9 +514,6 @@ public final class TaskViewUtils { 
            for (SurfaceControl leash: openingTargets) {

                t.setAlpha(leash, progress);

            }

            for (SurfaceControl leash: closingTargets) {

                t.setAlpha(leash, 1 - progress);

            }

            t.apply();

        });

        animator.addListener(new AnimatorListenerAdapter() {

quickstep/src/com/android/quickstep/util/SystemWindowManagerProxy.java

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
package com.android.quickstep.util;



import android.content.Context;

import android.hardware.display.DisplayManager;

import android.view.Display;



import com.android.launcher3.util.window.WindowManagerProxy;
@@ -43,4 +44,10 @@ public class SystemWindowManagerProxy extends WindowManagerProxy { 
    public int getRotation(Context context) {

        return context.getResources().getConfiguration().windowConfiguration.getRotation();

    }



    @Override

    protected Display[] getDisplays(Context context) {

        return context.getSystemService(DisplayManager.class).getDisplays(

                DisplayManager.DISPLAY_CATEGORY_ALL_INCLUDING_DISABLED);

    }

}

src/com/android/launcher3/allapps/FloatingHeaderView.java

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ public class FloatingHeaderView extends LinearLayout implements 
        int oldMaxHeight = mMaxTranslation;

        updateExpectedHeight();



        if (mMaxTranslation != oldMaxHeight) {

        if (mMaxTranslation != oldMaxHeight || mCollapsed) {

            BaseAllAppsContainerView<?> parent = (BaseAllAppsContainerView<?>) getParent();

            if (parent != null) {

                parent.setupHeader();

src/com/android/launcher3/config/FeatureFlags.java

+2 −2
Original line number Diff line number Diff line
@@ -265,8 +265,8 @@ public final class FeatureFlags { 
    public static final BooleanFlag ENABLE_ONE_SEARCH_MOTION = new DeviceFlag(

            "ENABLE_ONE_SEARCH_MOTION", true, "Enables animations in OneSearch.");



    public static final BooleanFlag ENABLE_SHOW_KEYBOARD_IN_ALL_APPS = new DeviceFlag(

            "ENABLE_SHOW_KEYBOARD_IN_ALL_APPS", true,

    public static final BooleanFlag ENABLE_SHOW_KEYBOARD_OPTION_IN_ALL_APPS = new DeviceFlag(

            "ENABLE_SHOW_KEYBOARD_OPTION_IN_ALL_APPS", true,

            "Enable option to show keyboard when going to all-apps");



    public static final BooleanFlag USE_LOCAL_ICON_OVERRIDES = getDebugFlag(

src/com/android/launcher3/util/window/WindowManagerProxy.java

+8 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ public class WindowManagerProxy implements ResourceBasedOverride { 
     */

    public ArrayMap<String, Pair<CachedDisplayInfo, WindowBounds[]>> estimateInternalDisplayBounds(

            Context context) {

        Display[] displays = context.getSystemService(DisplayManager.class).getDisplays();

        Display[] displays = getDisplays(context);

        ArrayMap<String, Pair<CachedDisplayInfo, WindowBounds[]>> result = new ArrayMap<>();

        for (Display display : displays) {

            if (isInternalDisplay(display)) {
@@ -355,4 +355,11 @@ public class WindowManagerProxy implements ResourceBasedOverride { 
        }

        return d.getRotation();

    }



    /**

     * Returns all currently valid logical displays.

     */

    protected Display[] getDisplays(Context context) {

        return context.getSystemService(DisplayManager.class).getDisplays();

    }

}