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

Commit 08a2e18e authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Move split classes back into Shell" into udc-qpr-dev

parents b13733aa 7af74e7d

core/java/com/android/internal/policy/DividerSnapAlgorithm.java→libs/WindowManager/Shell/src/com/android/wm/shell/common/split/DividerSnapAlgorithm.java

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015 The Android Open Source Project

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.internal.policy;

package com.android.wm.shell.common.split;



import static android.view.WindowManager.DOCKED_INVALID;

import static android.view.WindowManager.DOCKED_LEFT;

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/DividerView.java

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ import androidx.annotation.NonNull; 
import androidx.annotation.Nullable;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.policy.DividerSnapAlgorithm;

import com.android.internal.protolog.common.ProtoLog;

import com.android.wm.shell.R;

import com.android.wm.shell.animation.Interpolators;

core/java/com/android/internal/policy/DockedDividerUtils.java→libs/WindowManager/Shell/src/com/android/wm/shell/common/split/DockedDividerUtils.java

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015 The Android Open Source Project

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.internal.policy;

package com.android.wm.shell.common.split;



import static android.view.WindowManager.DOCKED_BOTTOM;

import static android.view.WindowManager.DOCKED_INVALID;

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java

+2 −4
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ import static android.view.WindowManager.DOCKED_RIGHT; 
import static android.view.WindowManager.DOCKED_TOP;



import static com.android.internal.jank.InteractionJankMonitor.CUJ_SPLIT_SCREEN_RESIZE;

import static com.android.internal.policy.DividerSnapAlgorithm.SnapTarget.FLAG_DISMISS_END;

import static com.android.internal.policy.DividerSnapAlgorithm.SnapTarget.FLAG_DISMISS_START;

import static com.android.wm.shell.common.split.DividerSnapAlgorithm.SnapTarget.FLAG_DISMISS_END;

import static com.android.wm.shell.common.split.DividerSnapAlgorithm.SnapTarget.FLAG_DISMISS_START;

import static com.android.wm.shell.animation.Interpolators.DIM_INTERPOLATOR;

import static com.android.wm.shell.animation.Interpolators.SLOWDOWN_INTERPOLATOR;

import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT;
@@ -58,8 +58,6 @@ import android.window.WindowContainerTransaction; 
import androidx.annotation.Nullable;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.policy.DividerSnapAlgorithm;

import com.android.internal.policy.DockedDividerUtils;

import com.android.wm.shell.R;

import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.animation.Interpolators;

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/split/SplitLayoutTests.java

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import androidx.test.annotation.UiThreadTest; 
import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;



import com.android.internal.policy.DividerSnapAlgorithm;

import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.ShellTestCase;

import com.android.wm.shell.TestRunningTaskInfoBuilder;