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

Rename Stack to Task related terms (7/n)

Browse Source 
- Renaming PinnedStack to PinnedTask
- Renaming DockedStack to DockedTask

Bug: 157876447
Test: presubmit
Change-Id: I51c10564647ed0d46eddc0c51a1ee06eef897e43
This commit is contained in:
Louis Chang
2021-02-22 18:16:58 +08:00
parent c048b1c769
commit 7efc57797c
25 changed files with 124 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/WindowManager/Shell/src/com/android/wm/shell/WindowManagerShellWrapper.java
View File

@@ -22,7 +22,7 @@ import android.os.RemoteException;
import com.android.wm.shell.common.ShellExecutor;
import com.android.wm.shell.pip.PinnedStackListenerForwarder;
import com.android.wm.shell.pip.PinnedStackListenerForwarder.PinnedStackListener;
import com.android.wm.shell.pip.PinnedStackListenerForwarder.PinnedTaskListener;
/**
* The singleton wrapper to communicate between WindowManagerService and WMShell features
@@ -46,7 +46,7 @@ public class WindowManagerShellWrapper {
* Adds a pinned stack listener, which will receive updates from the window manager service
* along with any other pinned stack listeners that were added via this method.
*/
public void addPinnedStackListener(PinnedStackListener listener)
public void addPinnedStackListener(PinnedTaskListener listener)
throws RemoteException {
mPinnedStackListenerForwarder.addListener(listener);
mPinnedStackListenerForwarder.register(DEFAULT_DISPLAY);
@@ -55,7 +55,7 @@ public class WindowManagerShellWrapper {
/**
* Removes a pinned stack listener.
*/
public void removePinnedStackListener(PinnedStackListener listener) {
public void removePinnedStackListener(PinnedTaskListener listener) {
mPinnedStackListenerForwarder.removeListener(listener);
}

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

@@ -1213,7 +1213,7 @@ public class BubbleController {
/** PinnedStackListener that dispatches IME visibility updates to the stack. */
//TODO(b/170442945): Better way to do this / insets listener?
private class BubblesImeListener extends PinnedStackListenerForwarder.PinnedStackListener {
private class BubblesImeListener extends PinnedStackListenerForwarder.PinnedTaskListener {
@Override
public void onImeVisibilityChanged(boolean imeVisible, int imeHeight) {
if (mStackView != null) {

2
libs/WindowManager/Shell/src/com/android/wm/shell/common/TaskStackListenerImpl.java
View File

@@ -227,7 +227,7 @@ public class TaskStackListenerImpl extends TaskStackListener implements Handler.
}
@Override
public void onActivityDismissingDockedStack() {
public void onActivityDismissingDockedTask() {
mMainHandler.sendEmptyMessage(ON_ACTIVITY_DISMISSING_DOCKED_STACK);
}

2
libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/WindowManagerProxy.java
View File

@@ -105,7 +105,7 @@ class WindowManagerProxy {
synchronized (mDockedRect) {
mTouchableRegion.set(region);
}
WindowManagerGlobal.getWindowManagerService().setDockedStackDividerTouchRegion(
WindowManagerGlobal.getWindowManagerService().setDockedTaskDividerTouchRegion(
mTouchableRegion);
} catch (RemoteException e) {
Log.w(TAG, "Failed to set touchable region: " + e);

30
libs/WindowManager/Shell/src/com/android/wm/shell/pip/PinnedStackListenerForwarder.java
View File

@@ -20,7 +20,7 @@ import android.app.RemoteAction;
import android.content.ComponentName;
import android.content.pm.ParceledListSlice;
import android.os.RemoteException;
import android.view.IPinnedStackListener;
import android.view.IPinnedTaskListener;
import android.view.WindowManagerGlobal;
import androidx.annotation.BinderThread;
@@ -32,66 +32,66 @@ import java.util.ArrayList;
/**
* PinnedStackListener that simply forwards all calls to each listener added via
* {@link #addListener}. This is necessary since calling
* {@link com.android.server.wm.WindowManagerService#registerPinnedStackListener} replaces any
* {@link com.android.server.wm.WindowManagerService#registerPinnedTaskListener} replaces any
* previously set listener.
*/
public class PinnedStackListenerForwarder {
private final IPinnedStackListener mListenerImpl = new PinnedStackListenerImpl();
private final IPinnedTaskListener mListenerImpl = new PinnedTaskListenerImpl();
private final ShellExecutor mMainExecutor;
private final ArrayList<PinnedStackListener> mListeners = new ArrayList<>();
private final ArrayList<PinnedTaskListener> mListeners = new ArrayList<>();
public PinnedStackListenerForwarder(ShellExecutor mainExecutor) {
mMainExecutor = mainExecutor;
}
/** Adds a listener to receive updates from the WindowManagerService. */
public void addListener(PinnedStackListener listener) {
public void addListener(PinnedTaskListener listener) {
mListeners.add(listener);
}
/** Removes a listener so it will no longer receive updates from the WindowManagerService. */
public void removeListener(PinnedStackListener listener) {
public void removeListener(PinnedTaskListener listener) {
mListeners.remove(listener);
}
public void register(int displayId) throws RemoteException {
WindowManagerGlobal.getWindowManagerService().registerPinnedStackListener(
WindowManagerGlobal.getWindowManagerService().registerPinnedTaskListener(
displayId, mListenerImpl);
}
private void onMovementBoundsChanged(boolean fromImeAdjustment) {
for (PinnedStackListener listener : mListeners) {
for (PinnedTaskListener listener : mListeners) {
listener.onMovementBoundsChanged(fromImeAdjustment);
}
}
private void onImeVisibilityChanged(boolean imeVisible, int imeHeight) {
for (PinnedStackListener listener : mListeners) {
for (PinnedTaskListener listener : mListeners) {
listener.onImeVisibilityChanged(imeVisible, imeHeight);
}
}
private void onActionsChanged(ParceledListSlice<RemoteAction> actions) {
for (PinnedStackListener listener : mListeners) {
for (PinnedTaskListener listener : mListeners) {
listener.onActionsChanged(actions);
}
}
private void onActivityHidden(ComponentName componentName) {
for (PinnedStackListener listener : mListeners) {
for (PinnedTaskListener listener : mListeners) {
listener.onActivityHidden(componentName);
}
}
private void onAspectRatioChanged(float aspectRatio) {
for (PinnedStackListener listener : mListeners) {
for (PinnedTaskListener listener : mListeners) {
listener.onAspectRatioChanged(aspectRatio);
}
}
@BinderThread
private class PinnedStackListenerImpl extends IPinnedStackListener.Stub {
private class PinnedTaskListenerImpl extends IPinnedTaskListener.Stub {
@Override
public void onMovementBoundsChanged(boolean fromImeAdjustment) {
mMainExecutor.execute(() -> {
@@ -129,10 +129,10 @@ public class PinnedStackListenerForwarder {
}
/**
* A counterpart of {@link IPinnedStackListener} with empty implementations.
* A counterpart of {@link IPinnedTaskListener} with empty implementations.
* Subclasses can ignore those methods they do not intend to take action upon.
*/
public static class PinnedStackListener {
public static class PinnedTaskListener {
public void onMovementBoundsChanged(boolean fromImeAdjustment) {}
public void onImeVisibilityChanged(boolean imeVisible, int imeHeight) {}

10
libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java
View File

@@ -93,8 +93,8 @@ public class PipController implements PipTransitionController.PipTransitionCallb
protected PhonePipMenuController mMenuController;
protected PipTaskOrganizer mPipTaskOrganizer;
protected PinnedStackListenerForwarder.PinnedStackListener mPinnedStackListener =
new PipControllerPinnedStackListener();
protected PinnedStackListenerForwarder.PinnedTaskListener mPinnedTaskListener =
new PipControllerPinnedTaskListener();
/**
* Handler for display rotation changes.
@@ -178,8 +178,8 @@ public class PipController implements PipTransitionController.PipTransitionCallb
/**
* Handler for messages from the PIP controller.
*/
private class PipControllerPinnedStackListener extends
PinnedStackListenerForwarder.PinnedStackListener {
private class PipControllerPinnedTaskListener extends
PinnedStackListenerForwarder.PinnedTaskListener {
@Override
public void onImeVisibilityChanged(boolean imeVisible, int imeHeight) {
mPipBoundsState.setImeVisibility(imeVisible, imeHeight);
@@ -310,7 +310,7 @@ public class PipController implements PipTransitionController.PipTransitionCallb
mPipBoundsState.setDisplayLayout(new DisplayLayout(context, context.getDisplay()));
try {
mWindowManagerShellWrapper.addPinnedStackListener(mPinnedStackListener);
mWindowManagerShellWrapper.addPinnedStackListener(mPinnedTaskListener);
} catch (RemoteException e) {
Slog.e(TAG, "Failed to register pinned stack listener", e);
}

2
libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipController.java
View File

@@ -377,7 +377,7 @@ public class TvPipController implements PipTransitionController.PipTransitionCal
private void registerWmShellPinnedStackListener(WindowManagerShellWrapper wmShell) {
try {
wmShell.addPinnedStackListener(new PinnedStackListenerForwarder.PinnedStackListener() {
wmShell.addPinnedStackListener(new PinnedStackListenerForwarder.PinnedTaskListener() {
@Override
public void onImeVisibilityChanged(boolean imeVisible, int imeHeight) {
if (DEBUG) {

2
libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/TaskStackListenerImplTest.java
View File

@@ -198,7 +198,7 @@ public class TaskStackListenerImplTest {
@Test
public void testOnActivityDismissingDockedStack() {
mImpl.onActivityDismissingDockedStack();
mImpl.onActivityDismissingDockedTask();
verify(mCallback).onActivityDismissingDockedStack();
verify(mOtherCallback).onActivityDismissingDockedStack();
}

4
libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PipControllerTest.java
View File

@@ -124,7 +124,7 @@ public class PipControllerTest extends ShellTestCase {
final ComponentName component1 = new ComponentName(mContext, "component1");
when(mMockPipBoundsState.getLastPipComponentName()).thenReturn(component1);
mPipController.mPinnedStackListener.onActivityHidden(component1);
mPipController.mPinnedTaskListener.onActivityHidden(component1);
verify(mMockPipBoundsState).setLastPipComponentName(null);
}
@@ -135,7 +135,7 @@ public class PipControllerTest extends ShellTestCase {
final ComponentName component2 = new ComponentName(mContext, "component2");
when(mMockPipBoundsState.getLastPipComponentName()).thenReturn(component1);
mPipController.mPinnedStackListener.onActivityHidden(component2);
mPipController.mPinnedTaskListener.onActivityHidden(component2);
verify(mMockPipBoundsState, never()).setLastPipComponentName(null);
}