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

Commit 5ef80eb7 authored by Gaurav Bhola's avatar Gaurav Bhola Committed by Automerger Merge Worker
Browse files

Merge "[2/2] Split the taskview into view and shell part" into udc-dev am: 4dce0505 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22300202



Change-Id: Ia9b8613034f36d91f3e49aa4c62f0e9c28081430
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 09a820fe 4dce0505

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+3 −2
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ import androidx.annotation.Nullable; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.statusbar.IStatusBarService;

import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.TaskViewTransitions;

import com.android.wm.shell.WindowManagerShellWrapper;

import com.android.wm.shell.common.DisplayController;

import com.android.wm.shell.common.ExternalInterfaceBinder;
@@ -110,6 +109,8 @@ import com.android.wm.shell.sysui.ConfigurationChangeListener; 
import com.android.wm.shell.sysui.ShellCommandHandler;

import com.android.wm.shell.sysui.ShellController;

import com.android.wm.shell.sysui.ShellInit;

import com.android.wm.shell.taskview.TaskView;

import com.android.wm.shell.taskview.TaskViewTransitions;



import java.io.PrintWriter;

import java.util.ArrayList;
@@ -1706,7 +1707,7 @@ public class BubbleController implements ConfigurationChangeListener, 


    /**

     * Whether an intent is properly configured to display in a

     * {@link com.android.wm.shell.TaskView}.

     * {@link TaskView}.

     *

     * Keep checks in sync with BubbleExtractor#canLaunchInTaskView. Typically

     * that should filter out any invalid bubbles, but should protect SysUI side just in case.

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java

+2 −2
Original line number Diff line number Diff line
@@ -67,10 +67,10 @@ import androidx.annotation.Nullable; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.policy.ScreenDecorationsUtils;

import com.android.wm.shell.R;

import com.android.wm.shell.TaskView;

import com.android.wm.shell.TaskViewTaskController;

import com.android.wm.shell.common.AlphaOptimizedButton;

import com.android.wm.shell.common.TriangleShape;

import com.android.wm.shell.taskview.TaskView;

import com.android.wm.shell.taskview.TaskViewTaskController;



import java.io.PrintWriter;

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTaskViewHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -34,10 +34,10 @@ import android.view.View; 


import androidx.annotation.Nullable;



import com.android.wm.shell.TaskView;

import com.android.wm.shell.TaskViewTaskController;

import com.android.wm.shell.common.ShellExecutor;

import com.android.wm.shell.common.annotations.ShellMainThread;

import com.android.wm.shell.taskview.TaskView;

import com.android.wm.shell.taskview.TaskViewTaskController;



/**

 * Handles creating and updating the {@link TaskView} associated with a {@link Bubble}.

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java

+3 −3
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ import com.android.wm.shell.R; 
import com.android.wm.shell.RootDisplayAreaOrganizer;

import com.android.wm.shell.RootTaskDisplayAreaOrganizer;

import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.TaskViewFactory;

import com.android.wm.shell.TaskViewFactoryController;

import com.android.wm.shell.TaskViewTransitions;

import com.android.wm.shell.WindowManagerShellWrapper;

import com.android.wm.shell.activityembedding.ActivityEmbeddingController;

import com.android.wm.shell.back.BackAnimation;
@@ -93,6 +90,9 @@ import com.android.wm.shell.sysui.ShellCommandHandler; 
import com.android.wm.shell.sysui.ShellController;

import com.android.wm.shell.sysui.ShellInit;

import com.android.wm.shell.sysui.ShellInterface;

import com.android.wm.shell.taskview.TaskViewFactory;

import com.android.wm.shell.taskview.TaskViewFactoryController;

import com.android.wm.shell.taskview.TaskViewTransitions;

import com.android.wm.shell.transition.ShellTransitions;

import com.android.wm.shell.transition.Transitions;

import com.android.wm.shell.unfold.ShellUnfoldProgressProvider;

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import com.android.internal.statusbar.IStatusBarService; 
import com.android.launcher3.icons.IconProvider;

import com.android.wm.shell.RootTaskDisplayAreaOrganizer;

import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.TaskViewTransitions;

import com.android.wm.shell.WindowManagerShellWrapper;

import com.android.wm.shell.bubbles.BubbleController;

import com.android.wm.shell.bubbles.BubbleData;
@@ -89,6 +88,7 @@ import com.android.wm.shell.splitscreen.SplitScreenController; 
import com.android.wm.shell.sysui.ShellCommandHandler;

import com.android.wm.shell.sysui.ShellController;

import com.android.wm.shell.sysui.ShellInit;

import com.android.wm.shell.taskview.TaskViewTransitions;

import com.android.wm.shell.transition.DefaultMixedHandler;

import com.android.wm.shell.transition.Transitions;

import com.android.wm.shell.unfold.ShellUnfoldProgressProvider;