fixes more error
This commit is contained in:
1 parent
2e4a2330d3
commit
76aa855f1e
1419 files changed
+238037
-44
No files matched your search
@@ -0,0 +1,402 @@
|
||||
/*
|
||||
* Copyright (C) 2019 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.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.wm.shell.common;
|
||||
|
||||
import android.annotation.Nullable;
|
||||
import android.content.Context;
|
||||
import android.content.res.Configuration;
|
||||
import android.graphics.Rect;
|
||||
import android.hardware.display.DisplayManager;
|
||||
import android.os.RemoteException;
|
||||
import android.util.ArraySet;
|
||||
import android.util.Slog;
|
||||
import android.util.SparseArray;
|
||||
import android.view.Display;
|
||||
import android.view.IDisplayWindowListener;
|
||||
import android.view.IWindowManager;
|
||||
import android.view.InsetsState;
|
||||
import android.window.WindowContainerTransaction;
|
||||
|
||||
import androidx.annotation.BinderThread;
|
||||
|
||||
import com.android.wm.shell.common.DisplayChangeController.OnDisplayChangingListener;
|
||||
import com.android.wm.shell.shared.annotations.ShellMainThread;
|
||||
import com.android.wm.shell.sysui.ShellInit;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* This module deals with display rotations coming from WM. When WM starts a rotation: after it has
|
||||
* frozen the screen, it will call into this class. This will then call all registered local
|
||||
* controllers and give them a chance to queue up task changes to be applied synchronously with that
|
||||
* rotation.
|
||||
*/
|
||||
public class DisplayController {
|
||||
private static final String TAG = "DisplayController";
|
||||
|
||||
private final ShellExecutor mMainExecutor;
|
||||
private final Context mContext;
|
||||
private final IWindowManager mWmService;
|
||||
private final DisplayChangeController mChangeController;
|
||||
private final IDisplayWindowListener mDisplayContainerListener;
|
||||
|
||||
private final SparseArray<DisplayRecord> mDisplays = new SparseArray<>();
|
||||
private final ArrayList<OnDisplaysChangedListener> mDisplayChangedListeners = new ArrayList<>();
|
||||
|
||||
public DisplayController(Context context, IWindowManager wmService, ShellInit shellInit,
|
||||
ShellExecutor mainExecutor) {
|
||||
mMainExecutor = mainExecutor;
|
||||
mContext = context;
|
||||
mWmService = wmService;
|
||||
// TODO: Inject this instead
|
||||
mChangeController = new DisplayChangeController(mWmService, shellInit, mainExecutor);
|
||||
mDisplayContainerListener = new DisplayWindowListenerImpl();
|
||||
// Note, add this after DisplaceChangeController is constructed to ensure that is
|
||||
// initialized first
|
||||
shellInit.addInitCallback(this::onInit, this);
|
||||
}
|
||||
|
||||
/**
|
||||
* Initializes the window listener.
|
||||
*/
|
||||
public void onInit() {
|
||||
try {
|
||||
int[] displayIds = mWmService.registerDisplayWindowListener(mDisplayContainerListener);
|
||||
for (int i = 0; i < displayIds.length; i++) {
|
||||
onDisplayAdded(displayIds[i]);
|
||||
}
|
||||
} catch (RemoteException e) {
|
||||
throw new RuntimeException("Unable to register display controller");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets a display by id from DisplayManager.
|
||||
*/
|
||||
public Display getDisplay(int displayId) {
|
||||
final DisplayManager displayManager = mContext.getSystemService(DisplayManager.class);
|
||||
return displayManager.getDisplay(displayId);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the DisplayLayout associated with a display.
|
||||
*/
|
||||
public @Nullable DisplayLayout getDisplayLayout(int displayId) {
|
||||
final DisplayRecord r = mDisplays.get(displayId);
|
||||
return r != null ? r.mDisplayLayout : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets a display-specific context for a display.
|
||||
*/
|
||||
public @Nullable Context getDisplayContext(int displayId) {
|
||||
final DisplayRecord r = mDisplays.get(displayId);
|
||||
return r != null ? r.mContext : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the InsetsState of a display.
|
||||
*/
|
||||
public InsetsState getInsetsState(int displayId) {
|
||||
final DisplayRecord r = mDisplays.get(displayId);
|
||||
return r != null ? r.mInsetsState : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates the insets for a given display.
|
||||
*/
|
||||
public void updateDisplayInsets(int displayId, InsetsState state) {
|
||||
final DisplayRecord r = mDisplays.get(displayId);
|
||||
if (r != null) {
|
||||
r.setInsets(state);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a display window-container listener. It will get notified whenever a display's
|
||||
* configuration changes or when displays are added/removed from the WM hierarchy.
|
||||
*/
|
||||
public void addDisplayWindowListener(OnDisplaysChangedListener listener) {
|
||||
synchronized (mDisplays) {
|
||||
if (mDisplayChangedListeners.contains(listener)) {
|
||||
return;
|
||||
}
|
||||
mDisplayChangedListeners.add(listener);
|
||||
for (int i = 0; i < mDisplays.size(); ++i) {
|
||||
listener.onDisplayAdded(mDisplays.keyAt(i));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove a display window-container listener.
|
||||
*/
|
||||
public void removeDisplayWindowListener(OnDisplaysChangedListener listener) {
|
||||
synchronized (mDisplays) {
|
||||
mDisplayChangedListeners.remove(listener);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a display rotation controller.
|
||||
*/
|
||||
public void addDisplayChangingController(OnDisplayChangingListener controller) {
|
||||
mChangeController.addDisplayChangeListener(controller);
|
||||
}
|
||||
|
||||
/**
|
||||
* Removes a display rotation controller.
|
||||
*/
|
||||
public void removeDisplayChangingController(OnDisplayChangingListener controller) {
|
||||
mChangeController.removeDisplayChangeListener(controller);
|
||||
}
|
||||
|
||||
private void onDisplayAdded(int displayId) {
|
||||
synchronized (mDisplays) {
|
||||
if (mDisplays.get(displayId) != null) {
|
||||
return;
|
||||
}
|
||||
final Display display = getDisplay(displayId);
|
||||
if (display == null) {
|
||||
// It's likely that the display is private to some app and thus not
|
||||
// accessible by system-ui.
|
||||
return;
|
||||
}
|
||||
|
||||
final Context context = (displayId == Display.DEFAULT_DISPLAY)
|
||||
? mContext
|
||||
: mContext.createDisplayContext(display);
|
||||
final DisplayRecord record = new DisplayRecord(displayId);
|
||||
record.setDisplayLayout(context, new DisplayLayout(context, display));
|
||||
mDisplays.put(displayId, record);
|
||||
for (int i = 0; i < mDisplayChangedListeners.size(); ++i) {
|
||||
mDisplayChangedListeners.get(i).onDisplayAdded(displayId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/** Called when a display rotate requested. */
|
||||
public void onDisplayRotateRequested(WindowContainerTransaction wct, int displayId,
|
||||
int fromRotation, int toRotation) {
|
||||
synchronized (mDisplays) {
|
||||
final DisplayRecord dr = mDisplays.get(displayId);
|
||||
if (dr == null) {
|
||||
Slog.w(TAG, "Skipping Display rotate on non-added display.");
|
||||
return;
|
||||
}
|
||||
|
||||
if (dr.mDisplayLayout != null) {
|
||||
dr.mDisplayLayout.rotateTo(dr.mContext.getResources(), toRotation);
|
||||
}
|
||||
|
||||
mChangeController.dispatchOnDisplayChange(
|
||||
wct, displayId, fromRotation, toRotation, null /* newDisplayAreaInfo */);
|
||||
}
|
||||
}
|
||||
|
||||
private void onDisplayConfigurationChanged(int displayId, Configuration newConfig) {
|
||||
synchronized (mDisplays) {
|
||||
final DisplayRecord dr = mDisplays.get(displayId);
|
||||
if (dr == null) {
|
||||
Slog.w(TAG, "Skipping Display Configuration change on non-added"
|
||||
+ " display.");
|
||||
return;
|
||||
}
|
||||
final Display display = getDisplay(displayId);
|
||||
if (display == null) {
|
||||
Slog.w(TAG, "Skipping Display Configuration change on invalid"
|
||||
+ " display. It may have been removed.");
|
||||
return;
|
||||
}
|
||||
final Context perDisplayContext = (displayId == Display.DEFAULT_DISPLAY)
|
||||
? mContext
|
||||
: mContext.createDisplayContext(display);
|
||||
final Context context = perDisplayContext.createConfigurationContext(newConfig);
|
||||
dr.setDisplayLayout(context, new DisplayLayout(context, display));
|
||||
for (int i = 0; i < mDisplayChangedListeners.size(); ++i) {
|
||||
mDisplayChangedListeners.get(i).onDisplayConfigurationChanged(
|
||||
displayId, newConfig);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void onDisplayRemoved(int displayId) {
|
||||
synchronized (mDisplays) {
|
||||
if (mDisplays.get(displayId) == null) {
|
||||
return;
|
||||
}
|
||||
for (int i = mDisplayChangedListeners.size() - 1; i >= 0; --i) {
|
||||
mDisplayChangedListeners.get(i).onDisplayRemoved(displayId);
|
||||
}
|
||||
mDisplays.remove(displayId);
|
||||
}
|
||||
}
|
||||
|
||||
private void onFixedRotationStarted(int displayId, int newRotation) {
|
||||
synchronized (mDisplays) {
|
||||
if (mDisplays.get(displayId) == null || getDisplay(displayId) == null) {
|
||||
Slog.w(TAG, "Skipping onFixedRotationStarted on unknown"
|
||||
+ " display, displayId=" + displayId);
|
||||
return;
|
||||
}
|
||||
for (int i = mDisplayChangedListeners.size() - 1; i >= 0; --i) {
|
||||
mDisplayChangedListeners.get(i).onFixedRotationStarted(
|
||||
displayId, newRotation);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void onFixedRotationFinished(int displayId) {
|
||||
synchronized (mDisplays) {
|
||||
if (mDisplays.get(displayId) == null || getDisplay(displayId) == null) {
|
||||
Slog.w(TAG, "Skipping onFixedRotationFinished on unknown"
|
||||
+ " display, displayId=" + displayId);
|
||||
return;
|
||||
}
|
||||
for (int i = mDisplayChangedListeners.size() - 1; i >= 0; --i) {
|
||||
mDisplayChangedListeners.get(i).onFixedRotationFinished(displayId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void onKeepClearAreasChanged(int displayId, Set<Rect> restricted,
|
||||
Set<Rect> unrestricted) {
|
||||
synchronized (mDisplays) {
|
||||
if (mDisplays.get(displayId) == null || getDisplay(displayId) == null) {
|
||||
Slog.w(TAG, "Skipping onKeepClearAreasChanged on unknown"
|
||||
+ " display, displayId=" + displayId);
|
||||
return;
|
||||
}
|
||||
for (int i = mDisplayChangedListeners.size() - 1; i >= 0; --i) {
|
||||
mDisplayChangedListeners.get(i)
|
||||
.onKeepClearAreasChanged(displayId, restricted, unrestricted);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static class DisplayRecord {
|
||||
private int mDisplayId;
|
||||
private Context mContext;
|
||||
private DisplayLayout mDisplayLayout;
|
||||
private InsetsState mInsetsState = new InsetsState();
|
||||
|
||||
private DisplayRecord(int displayId) {
|
||||
mDisplayId = displayId;
|
||||
}
|
||||
|
||||
private void setDisplayLayout(Context context, DisplayLayout displayLayout) {
|
||||
mContext = context;
|
||||
mDisplayLayout = displayLayout;
|
||||
mDisplayLayout.setInsets(mContext.getResources(), mInsetsState);
|
||||
}
|
||||
|
||||
private void setInsets(InsetsState state) {
|
||||
mInsetsState = state;
|
||||
mDisplayLayout.setInsets(mContext.getResources(), state);
|
||||
}
|
||||
}
|
||||
|
||||
@BinderThread
|
||||
private class DisplayWindowListenerImpl extends IDisplayWindowListener.Stub {
|
||||
@Override
|
||||
public void onDisplayAdded(int displayId) {
|
||||
mMainExecutor.execute(() -> {
|
||||
DisplayController.this.onDisplayAdded(displayId);
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDisplayConfigurationChanged(int displayId, Configuration newConfig) {
|
||||
mMainExecutor.execute(() -> {
|
||||
DisplayController.this.onDisplayConfigurationChanged(displayId, newConfig);
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDisplayRemoved(int displayId) {
|
||||
mMainExecutor.execute(() -> {
|
||||
DisplayController.this.onDisplayRemoved(displayId);
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFixedRotationStarted(int displayId, int newRotation) {
|
||||
mMainExecutor.execute(() -> {
|
||||
DisplayController.this.onFixedRotationStarted(displayId, newRotation);
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFixedRotationFinished(int displayId) {
|
||||
mMainExecutor.execute(() -> {
|
||||
DisplayController.this.onFixedRotationFinished(displayId);
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onKeepClearAreasChanged(int displayId, List<Rect> restricted,
|
||||
List<Rect> unrestricted) {
|
||||
mMainExecutor.execute(() -> {
|
||||
DisplayController.this.onKeepClearAreasChanged(displayId,
|
||||
new ArraySet<>(restricted), new ArraySet<>(unrestricted));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets notified when a display is added/removed to the WM hierarchy and when a display's
|
||||
* window-configuration changes.
|
||||
*
|
||||
* @see IDisplayWindowListener
|
||||
*/
|
||||
@ShellMainThread
|
||||
public interface OnDisplaysChangedListener {
|
||||
/**
|
||||
* Called when a display has been added to the WM hierarchy.
|
||||
*/
|
||||
default void onDisplayAdded(int displayId) {}
|
||||
|
||||
/**
|
||||
* Called when a display's window-container configuration changes.
|
||||
*/
|
||||
default void onDisplayConfigurationChanged(int displayId, Configuration newConfig) {}
|
||||
|
||||
/**
|
||||
* Called when a display is removed.
|
||||
*/
|
||||
default void onDisplayRemoved(int displayId) {}
|
||||
|
||||
/**
|
||||
* Called when fixed rotation on a display is started.
|
||||
*/
|
||||
default void onFixedRotationStarted(int displayId, int newRotation) {}
|
||||
|
||||
/**
|
||||
* Called when fixed rotation on a display is finished.
|
||||
*/
|
||||
default void onFixedRotationFinished(int displayId) {}
|
||||
|
||||
/**
|
||||
* Called when keep-clear areas on a display have changed.
|
||||
*/
|
||||
default void onKeepClearAreasChanged(int displayId, Set<Rect> restricted,
|
||||
Set<Rect> unrestricted) {}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user