Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Migrate WindowContext#onConfigurationChanged to ClientTransaction (6/n)" into main

Browse Source
This commit is contained in:
Chris Li
2023-07-25 03:53:39 +00:00
committed by Android (Google) Code Review
parent edf8b49619 74a971e7d6
commit 1bf9b453c7
8 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/ActivityThread.java
View File

@@ -65,7 +65,6 @@ import android.app.servertransaction.PendingTransactionActions.StopInfo;
import android.app.servertransaction.ResumeActivityItem;
import android.app.servertransaction.TransactionExecutor;
import android.app.servertransaction.TransactionExecutorHelper;
import android.app.servertransaction.WindowTokenClientController;
import android.bluetooth.BluetoothFrameworkInitializer;
import android.companion.virtual.VirtualDeviceManager;
import android.compat.annotation.UnsupportedAppUsage;
@@ -205,6 +204,7 @@ import android.window.SizeConfigurationBuckets;
import android.window.SplashScreen;
import android.window.SplashScreenView;
import android.window.WindowProviderService;
import android.window.WindowTokenClientController;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;

2
core/java/android/app/ContextImpl.java
View File

@@ -27,7 +27,6 @@ import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SuppressLint;
import android.annotation.UiContext;
import android.app.servertransaction.WindowTokenClientController;
import android.companion.virtual.VirtualDeviceManager;
import android.compat.annotation.UnsupportedAppUsage;
import android.content.AttributionSource;
@@ -97,6 +96,7 @@ import android.view.DisplayAdjustments;
import android.view.autofill.AutofillManager.AutofillClient;
import android.window.WindowContext;
import android.window.WindowTokenClient;
import android.window.WindowTokenClientController;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.util.Preconditions;

1
core/java/android/window/WindowContextController.java
View File

@@ -21,7 +21,6 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.app.servertransaction.WindowTokenClientController;
import android.content.Context;
import android.os.Bundle;
import android.os.IBinder;

1
core/java/android/window/WindowTokenClient.java
View File

@@ -25,7 +25,6 @@ import android.annotation.NonNull;
import android.app.ActivityThread;
import android.app.IWindowToken;
import android.app.ResourcesManager;
import android.app.servertransaction.WindowTokenClientController;
import android.content.Context;
import android.content.res.CompatibilityInfo;
import android.content.res.Configuration;

6
core/java/android/app/servertransaction/WindowTokenClientController.java → core/java/android/window/WindowTokenClientController.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package android.app.servertransaction;
package android.window;
import static android.view.WindowManager.LayoutParams.WindowType;
import static android.view.WindowManagerGlobal.getWindowManagerService;
@@ -23,6 +23,8 @@ import android.annotation.NonNull;
import android.annotation.Nullable;
import android.app.ActivityThread;
import android.app.IApplicationThread;
import android.app.servertransaction.WindowContextConfigurationChangeItem;
import android.app.servertransaction.WindowContextWindowRemovalItem;
import android.content.Context;
import android.content.res.Configuration;
import android.os.Bundle;
@@ -31,8 +33,6 @@ import android.os.RemoteException;
import android.util.ArrayMap;
import android.util.Log;
import android.view.IWindowManager;
import android.window.WindowContext;
import android.window.WindowTokenClient;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;

2
core/tests/coretests/src/android/app/activity/ActivityThreadTest.java
View File

@@ -49,7 +49,6 @@ import android.app.servertransaction.ConfigurationChangeItem;
import android.app.servertransaction.NewIntentItem;
import android.app.servertransaction.ResumeActivityItem;
import android.app.servertransaction.StopActivityItem;
import android.app.servertransaction.WindowTokenClientController;
import android.content.Context;
import android.content.Intent;
import android.content.res.CompatibilityInfo;
@@ -65,6 +64,7 @@ import android.util.DisplayMetrics;
import android.util.MergedConfiguration;
import android.view.Display;
import android.view.View;
import android.window.WindowTokenClientController;
import androidx.test.filters.MediumTest;
import androidx.test.platform.app.InstrumentationRegistry;

1
core/tests/coretests/src/android/window/WindowContextControllerTest.java
View File

@@ -30,7 +30,6 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import android.app.servertransaction.WindowTokenClientController;
import android.os.Binder;
import android.platform.test.annotations.Presubmit;

3
core/tests/coretests/src/android/app/servertransaction/WindowTokenClientControllerTest.java → core/tests/coretests/src/android/window/WindowTokenClientControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package android.app.servertransaction;
package android.window;
import static android.view.Display.DEFAULT_DISPLAY;
import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
@@ -36,7 +36,6 @@ import android.os.RemoteException;
import android.platform.test.annotations.Presubmit;
import android.view.IWindowManager;
import android.view.WindowManagerGlobal;
import android.window.WindowTokenClient;
import androidx.test.filters.SmallTest;