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

Merge "Add the insets visibilities requested by the focussed window in topFocussedWindowChanged() api." into tm-dev

Browse Source
This commit is contained in:
Gaurav Bhola
2022-04-01 19:57:58 +00:00
committed by Android (Google) Code Review
parent 2a2931d93f 3b42bacd29
commit be5abebe9f
7 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/IDisplayWindowInsetsController.aidl
View File

@@ -18,6 +18,7 @@ package android.view;
import android.view.InsetsSourceControl;
import android.view.InsetsState;
import android.view.InsetsVisibilities;
/**
* Singular controller of insets to use when there isn't another obvious controller available.
@@ -30,8 +31,9 @@ oneway interface IDisplayWindowInsetsController {
* Called when top focused window changes to determine whether or not to take over insets
* control. Won't be called if config_remoteInsetsControllerControlsSystemBars is false.
* @param packageName: Passes the top package name
* @param requestedVisibilities The insets visibilities requested by the focussed window.
*/
void topFocusedWindowChanged(String packageName);
void topFocusedWindowChanged(String packageName, in InsetsVisibilities insetsVisibilities);
/**
* @see IWindow#insetsChanged

4
libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayImeController.java
View File

@@ -40,7 +40,6 @@ import android.view.WindowInsets;
import android.view.animation.Interpolator;
import android.view.animation.PathInterpolator;
import androidx.annotation.BinderThread;
import androidx.annotation.VisibleForTesting;
import com.android.internal.view.IInputMethodManager;
@@ -325,7 +324,8 @@ public class DisplayImeController implements DisplayController.OnDisplaysChanged
}
@Override
public void topFocusedWindowChanged(String packageName) {
public void topFocusedWindowChanged(String packageName,
InsetsVisibilities requestedVisibilities) {
// Do nothing
}

17
libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayInsetsController.java
View File

@@ -23,6 +23,7 @@ import android.view.IDisplayWindowInsetsController;
import android.view.IWindowManager;
import android.view.InsetsSourceControl;
import android.view.InsetsState;
import android.view.InsetsVisibilities;
import androidx.annotation.BinderThread;
@@ -170,13 +171,14 @@ public class DisplayInsetsController implements DisplayController.OnDisplaysChan
}
}
private void topFocusedWindowChanged(String packageName) {
private void topFocusedWindowChanged(String packageName,
InsetsVisibilities requestedVisibilities) {
CopyOnWriteArrayList<OnInsetsChangedListener> listeners = mListeners.get(mDisplayId);
if (listeners == null) {
return;
}
for (OnInsetsChangedListener listener : listeners) {
listener.topFocusedWindowChanged(packageName);
listener.topFocusedWindowChanged(packageName, requestedVisibilities);
}
}
@@ -184,9 +186,10 @@ public class DisplayInsetsController implements DisplayController.OnDisplaysChan
private class DisplayWindowInsetsControllerImpl
extends IDisplayWindowInsetsController.Stub {
@Override
public void topFocusedWindowChanged(String packageName) throws RemoteException {
public void topFocusedWindowChanged(String packageName,
InsetsVisibilities requestedVisibilities) throws RemoteException {
mMainExecutor.execute(() -> {
PerDisplay.this.topFocusedWindowChanged(packageName);
PerDisplay.this.topFocusedWindowChanged(packageName, requestedVisibilities);
});
}
@@ -231,9 +234,11 @@ public class DisplayInsetsController implements DisplayController.OnDisplaysChan
/**
* Called when top focused window changes to determine whether or not to take over insets
* control. Won't be called if config_remoteInsetsControllerControlsSystemBars is false.
* @param packageName: Passes the top package name
* @param packageName The name of the package that is open in the top focussed window.
* @param requestedVisibilities The insets visibilities requested by the focussed window.
*/
default void topFocusedWindowChanged(String packageName) {}
default void topFocusedWindowChanged(String packageName,
InsetsVisibilities requestedVisibilities) {}
/**
* Called when the window insets configuration has changed.

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

@@ -19,11 +19,8 @@ package com.android.wm.shell.common;
import static android.view.Display.DEFAULT_DISPLAY;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.notNull;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -33,6 +30,7 @@ import android.view.IDisplayWindowInsetsController;
import android.view.IWindowManager;
import android.view.InsetsSourceControl;
import android.view.InsetsState;
import android.view.InsetsVisibilities;
import androidx.test.filters.SmallTest;
@@ -42,7 +40,6 @@ import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import java.util.List;
@@ -99,7 +96,8 @@ public class DisplayInsetsControllerTest {
mController.addInsetsChangedListener(DEFAULT_DISPLAY, defaultListener);
mController.addInsetsChangedListener(SECOND_DISPLAY, secondListener);
mInsetsControllersByDisplayId.get(DEFAULT_DISPLAY).topFocusedWindowChanged(null);
mInsetsControllersByDisplayId.get(DEFAULT_DISPLAY).topFocusedWindowChanged(null,
new InsetsVisibilities());
mInsetsControllersByDisplayId.get(DEFAULT_DISPLAY).insetsChanged(null);
mInsetsControllersByDisplayId.get(DEFAULT_DISPLAY).insetsControlChanged(null, null);
mInsetsControllersByDisplayId.get(DEFAULT_DISPLAY).showInsets(0, false);
@@ -118,7 +116,8 @@ public class DisplayInsetsControllerTest {
assertTrue(secondListener.showInsetsCount == 0);
assertTrue(secondListener.hideInsetsCount == 0);
mInsetsControllersByDisplayId.get(SECOND_DISPLAY).topFocusedWindowChanged(null);
mInsetsControllersByDisplayId.get(SECOND_DISPLAY).topFocusedWindowChanged(null,
new InsetsVisibilities());
mInsetsControllersByDisplayId.get(SECOND_DISPLAY).insetsChanged(null);
mInsetsControllersByDisplayId.get(SECOND_DISPLAY).insetsControlChanged(null, null);
mInsetsControllersByDisplayId.get(SECOND_DISPLAY).showInsets(0, false);
@@ -165,7 +164,8 @@ public class DisplayInsetsControllerTest {
int hideInsetsCount = 0;
@Override
public void topFocusedWindowChanged(String packageName) {
public void topFocusedWindowChanged(String packageName,
InsetsVisibilities requestedVisibilities) {
topFocusedWindowChangedCount++;
}

5
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -6369,10 +6369,11 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
* Notifies the remote insets controller that the top focused window has changed.
*
* @param packageName The name of the package that is open in the top focused window.
* @param requestedVisibilities The insets visibilities requested by the focussed window.
*/
void topFocusedWindowChanged(String packageName) {
void topFocusedWindowChanged(String packageName, InsetsVisibilities requestedVisibilities) {
try {
mRemoteInsetsController.topFocusedWindowChanged(packageName);
mRemoteInsetsController.topFocusedWindowChanged(packageName, requestedVisibilities);
} catch (RemoteException e) {
Slog.w(TAG, "Failed to deliver package in top focused window change", e);
}

4
services/core/java/com/android/server/wm/InsetsPolicy.java
View File

@@ -533,7 +533,7 @@ class InsetsPolicy {
}
if (remoteInsetsControllerControlsSystemBars(focusedWin)) {
mDisplayContent.mRemoteInsetsControlTarget.topFocusedWindowChanged(
focusedWin.mAttrs.packageName);
focusedWin.mAttrs.packageName, focusedWin.getRequestedVisibilities());
return mDisplayContent.mRemoteInsetsControlTarget;
}
if (mPolicy.areSystemBarsForcedShownLw()) {
@@ -590,7 +590,7 @@ class InsetsPolicy {
}
if (remoteInsetsControllerControlsSystemBars(focusedWin)) {
mDisplayContent.mRemoteInsetsControlTarget.topFocusedWindowChanged(
focusedWin.mAttrs.packageName);
focusedWin.mAttrs.packageName, focusedWin.getRequestedVisibilities());
return mDisplayContent.mRemoteInsetsControlTarget;
}
if (mPolicy.areSystemBarsForcedShownLw()) {

4
services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java
View File

@@ -87,6 +87,7 @@ import android.view.IDisplayWindowInsetsController;
import android.view.IWindow;
import android.view.InsetsSourceControl;
import android.view.InsetsState;
import android.view.InsetsVisibilities;
import android.view.Surface;
import android.view.SurfaceControl;
import android.view.SurfaceControl.Transaction;
@@ -793,7 +794,8 @@ class WindowTestsBase extends SystemServiceTestsBase {
}
@Override
public void topFocusedWindowChanged(String packageName) {
public void topFocusedWindowChanged(String packageName,
InsetsVisibilities requestedVisibilities) {
}
};
}