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

Commit b1bf0ae1 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Automerger Merge Worker
Browse files

Merge "Move some window related files to android.window package" into rvc-dev am: f09fdecd

Change-Id: I1d7576d35920811a6330983fca28689c620184fd
parents 4c8c15f1 f09fdecd
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ import android.util.ArrayMap;
import android.util.DisplayMetrics;
import android.util.Singleton;
import android.util.Size;
import android.view.IWindowContainer;
import android.window.IWindowContainer;
import android.view.Surface;

import com.android.internal.app.LocalePicker;
+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.os.IBinder;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.util.Singleton;
import android.window.ITaskOrganizerController;

import java.util.List;

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import android.app.IProcessObserver;
import android.app.IRequestFinishCallback;
import android.app.IServiceConnection;
import android.app.IStopUserCallback;
import android.app.ITaskOrganizerController;
import android.window.ITaskOrganizerController;
import android.app.ITaskStackListener;
import android.app.IUiAutomationConnection;
import android.app.IUidObserver;
@@ -69,7 +69,7 @@ import android.os.StrictMode;
import android.os.WorkSource;
import android.service.voice.IVoiceInteractionSession;
import android.view.IRecentsAnimationRunner;
import android.view.ITaskOrganizer;
import android.window.ITaskOrganizer;
import android.view.RemoteAnimationDefinition;
import android.view.RemoteAnimationAdapter;
import com.android.internal.app.IVoiceInteractor;
+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import android.content.res.Configuration;
import android.os.Parcel;
import android.os.RemoteException;
import android.util.Log;
import android.view.IWindowContainer;
import android.window.IWindowContainer;

/**
 * Stores information about a particular Task.
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@

package android.view;

import android.view.WindowContainerTransaction;
import android.window.WindowContainerTransaction;

/**
 * Interface to be invoked by the controller when it has finished preparing for a display rotation.
Loading