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

Commit 2a3002a5 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Revert "SystemUI Split via TaskOrganizer" 

Revert "Update CTS tests for tile-based split-screen"

Revert submission 9964969-sysui_split_screen

Reason for revert:
- Random SysUI crash (ag/10335781)
- Breaks IME tests with new_insets set to 2
- Crashes SysUI in split screen with new_insets set to 2.

Reverted Changes:
I103f68030: SystemUI Split via TaskOrganizer
If6740b7ee: Connect split-screen things to systemui divider
I44f497e7d: Update CTS tests for tile-based split-screen

Change-Id: Ife6878044ff19905ed97b599d8c67f80cb8e399e
parent e96570e2

core/java/android/app/IActivityTaskManager.aidl

+5 −0
Original line number Diff line number Diff line
@@ -315,6 +315,11 @@ interface IActivityTaskManager { 
    void positionTaskInStack(int taskId, int stackId, int position);

    void reportSizeConfigurations(in IBinder token, in int[] horizontalSizeConfiguration,

            in int[] verticalSizeConfigurations, in int[] smallestWidthConfigurations);

    /**

     * Dismisses split-screen multi-window mode.

     * {@param toTop} If true the current primary split-screen stack will be placed or left on top.

     */

    void dismissSplitScreenMode(boolean toTop);



    /**

     * Dismisses PiP

core/java/com/android/internal/policy/DockedDividerUtils.java

+19 −20
Original line number Diff line number Diff line
@@ -16,15 +16,14 @@ 


package com.android.internal.policy;



import android.graphics.Rect;



import static android.view.WindowManager.DOCKED_BOTTOM;

import static android.view.WindowManager.DOCKED_INVALID;

import static android.view.WindowManager.DOCKED_LEFT;

import static android.view.WindowManager.DOCKED_RIGHT;

import static android.view.WindowManager.DOCKED_TOP;



import android.content.res.Resources;

import android.graphics.Rect;



/**

 * Utility functions for docked stack divider used by both window manager and System UI.

 *
@@ -106,6 +105,23 @@ public class DockedDividerUtils { 
        return start + (end - start) / 2 - dividerSize / 2;

    }



    public static int getDockSideFromCreatedMode(boolean dockOnTopOrLeft,

            boolean isHorizontalDivision) {

        if (dockOnTopOrLeft) {

            if (isHorizontalDivision) {

                return DOCKED_TOP;

            } else {

                return DOCKED_LEFT;

            }

        } else {

            if (isHorizontalDivision) {

                return DOCKED_BOTTOM;

            } else {

                return DOCKED_RIGHT;

            }

        }

    }



    public static int invertDockSide(int dockSide) {

        switch (dockSide) {

            case DOCKED_LEFT:
@@ -120,21 +136,4 @@ public class DockedDividerUtils { 
                return DOCKED_INVALID;

        }

    }



    /** Returns the inset distance from the divider window edge to the dividerview. */

    public static int getDividerInsets(Resources res) {

        return res.getDimensionPixelSize(com.android.internal.R.dimen.docked_stack_divider_insets);

    }



    /** Returns the size of the divider */

    public static int getDividerSize(Resources res, int dividerInsets) {

        final int windowWidth = res.getDimensionPixelSize(

                com.android.internal.R.dimen.docked_stack_divider_thickness);

        return windowWidth - 2 * dividerInsets;

    }



    /** Returns the docked-stack side */

    public static int getDockSide(int displayWidth, int displayHeight) {

        return displayWidth > displayHeight ? DOCKED_LEFT : DOCKED_TOP;

    }

}

core/proto/android/server/windowmanagerservice.proto

+0 −1
Original line number Diff line number Diff line
@@ -275,7 +275,6 @@ message TaskProto { 
    optional float adjust_divider_amount = 25;

    optional bool animating_bounds = 26;

    optional float minimize_amount = 27;

    optional bool created_by_organizer = 28;

}



/* represents ActivityRecordProto */

packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl

+0 −5
Original line number Diff line number Diff line
@@ -123,9 +123,4 @@ interface ISystemUiProxy { 
     */

     void handleImageAsScreenshot(in Bitmap screenImage, in Rect locationInScreen,

              in Insets visibleInsets, int taskId) = 21;



    /**

     * Sets the split-screen divider minimized state

     */

    void setSplitScreenMinimized(boolean minimized) = 22;

}

packages/SystemUI/src/com/android/systemui/Dependency.java

+0 −3
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ import com.android.systemui.shared.plugins.PluginManager; 
import com.android.systemui.shared.system.ActivityManagerWrapper;

import com.android.systemui.shared.system.DevicePolicyManagerWrapper;

import com.android.systemui.shared.system.PackageManagerWrapper;

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NavigationBarController;

import com.android.systemui.statusbar.NotificationListener;
@@ -330,7 +329,6 @@ public class Dependency { 
    @Inject Lazy<DisplayImeController> mDisplayImeController;

    @Inject Lazy<RecordingController> mRecordingController;

    @Inject Lazy<ProtoTracer> mProtoTracer;

    @Inject Lazy<Divider> mDivider;



    @Inject

    public Dependency() {
@@ -532,7 +530,6 @@ public class Dependency { 
        mProviders.put(AutoHideController.class, mAutoHideController::get);



        mProviders.put(RecordingController.class, mRecordingController::get);

        mProviders.put(Divider.class, mDivider::get);



        sDependency = this;

    }