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

Merge "Fix incorrect behavior of back button in kids mode" into tm-qpr-dev

Browse Source
This commit is contained in:
Shawn Lin
2023-02-09 11:06:41 +00:00
committed by Android (Google) Code Review
parent 6fc081bd60 24b2a01c50
commit cdf3f3dcb5
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizer.java
View File

@@ -16,6 +16,7 @@
package com.android.wm.shell.kidsmode; package com.android.wm.shell.kidsmode;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD; import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;
import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
@@ -68,7 +69,7 @@ public class KidsModeTaskOrganizer extends ShellTaskOrganizer {
private static final String TAG = "KidsModeTaskOrganizer"; private static final String TAG = "KidsModeTaskOrganizer";
private static final int[] CONTROLLED_ACTIVITY_TYPES = private static final int[] CONTROLLED_ACTIVITY_TYPES =
{ACTIVITY_TYPE_UNDEFINED, ACTIVITY_TYPE_STANDARD}; {ACTIVITY_TYPE_UNDEFINED, ACTIVITY_TYPE_STANDARD, ACTIVITY_TYPE_HOME};
private static final int[] CONTROLLED_WINDOWING_MODES = private static final int[] CONTROLLED_WINDOWING_MODES =
{WINDOWING_MODE_FULLSCREEN, WINDOWING_MODE_UNDEFINED}; {WINDOWING_MODE_FULLSCREEN, WINDOWING_MODE_UNDEFINED};
@@ -93,6 +94,8 @@ public class KidsModeTaskOrganizer extends ShellTaskOrganizer {
private KidsModeSettingsObserver mKidsModeSettingsObserver; private KidsModeSettingsObserver mKidsModeSettingsObserver;
private boolean mEnabled; private boolean mEnabled;
private ActivityManager.RunningTaskInfo mHomeTask;
private final BroadcastReceiver mUserSwitchIntentReceiver = new BroadcastReceiver() { private final BroadcastReceiver mUserSwitchIntentReceiver = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
@@ -219,6 +222,13 @@ public class KidsModeTaskOrganizer extends ShellTaskOrganizer {
} }
super.onTaskAppeared(taskInfo, leash); super.onTaskAppeared(taskInfo, leash);
// Only allow home to draw under system bars.
if (taskInfo.getActivityType() == ACTIVITY_TYPE_HOME) {
final WindowContainerTransaction wct = getWindowContainerTransaction();
wct.setBounds(taskInfo.token, new Rect(0, 0, mDisplayWidth, mDisplayHeight));
mSyncQueue.queue(wct);
mHomeTask = taskInfo;
}
mSyncQueue.runInSync(t -> { mSyncQueue.runInSync(t -> {
// Reset several properties back to fullscreen (PiP, for example, leaves all these // Reset several properties back to fullscreen (PiP, for example, leaves all these
// properties in a bad state). // properties in a bad state).
@@ -291,6 +301,13 @@ public class KidsModeTaskOrganizer extends ShellTaskOrganizer {
} }
mLaunchRootTask = null; mLaunchRootTask = null;
mLaunchRootLeash = null; mLaunchRootLeash = null;
if (mHomeTask != null && mHomeTask.token != null) {
final WindowContainerToken homeToken = mHomeTask.token;
final WindowContainerTransaction wct = getWindowContainerTransaction();
wct.setBounds(homeToken, null);
mSyncQueue.queue(wct);
}
mHomeTask = null;
unregisterOrganizer(); unregisterOrganizer();
} }
@@ -320,7 +337,7 @@ public class KidsModeTaskOrganizer extends ShellTaskOrganizer {
final SurfaceControl rootLeash = mLaunchRootLeash; final SurfaceControl rootLeash = mLaunchRootLeash;
mSyncQueue.runInSync(t -> { mSyncQueue.runInSync(t -> {
t.setPosition(rootLeash, taskBounds.left, taskBounds.top); t.setPosition(rootLeash, taskBounds.left, taskBounds.top);
t.setWindowCrop(rootLeash, taskBounds.width(), taskBounds.height()); t.setWindowCrop(rootLeash, mDisplayWidth, mDisplayHeight);
}); });
} }
} }
@@ -351,7 +368,7 @@ public class KidsModeTaskOrganizer extends ShellTaskOrganizer {
final SurfaceControl finalLeash = mLaunchRootLeash; final SurfaceControl finalLeash = mLaunchRootLeash;
mSyncQueue.runInSync(t -> { mSyncQueue.runInSync(t -> {
t.setPosition(finalLeash, taskBounds.left, taskBounds.top); t.setPosition(finalLeash, taskBounds.left, taskBounds.top);
t.setWindowCrop(finalLeash, taskBounds.width(), taskBounds.height()); t.setWindowCrop(finalLeash, mDisplayWidth, mDisplayHeight);
}); });
} }