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

Merge "Add multi-user support for kids mode" into tm-dev

Browse Source
This commit is contained in:
Shawn Lin
2022-05-10 12:30:16 +00:00
committed by Android (Google) Code Review
parent 9bcc78687c 2b9e4b6550
commit 3ab2eccace
4 changed files with 45 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/com/android/internal/policy/ForceShowNavBarSettingsObserver.java
View File

@@ -16,13 +16,18 @@
package com.android.internal.policy;
import android.annotation.NonNull;
import android.app.ActivityManager;
import android.content.ContentResolver;
import android.content.Context;
import android.database.ContentObserver;
import android.net.Uri;
import android.os.Handler;
import android.os.UserHandle;
import android.provider.Settings;
import java.util.Collection;
/**
* A ContentObserver for listening {@link Settings.Secure#NAV_BAR_FORCE_VISIBLE} setting key.
*
@@ -59,7 +64,11 @@ public class ForceShowNavBarSettingsObserver extends ContentObserver {
}
@Override
public void onChange(boolean selfChange) {
public void onChange(boolean selfChange, @NonNull Collection<Uri> uris, int flags, int userId) {
if (userId != ActivityManager.getCurrentUser()) {
return;
}
if (mOnChangeRunnable != null) {
mOnChangeRunnable.run();
}

11
libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeSettingsObserver.java
View File

@@ -16,13 +16,18 @@
package com.android.wm.shell.kidsmode;
import android.annotation.NonNull;
import android.app.ActivityManager;
import android.content.ContentResolver;
import android.content.Context;
import android.database.ContentObserver;
import android.net.Uri;
import android.os.Handler;
import android.os.UserHandle;
import android.provider.Settings;
import java.util.Collection;
/**
* A ContentObserver for listening kids mode relative setting keys:
* - {@link Settings.Secure#NAVIGATION_MODE}
@@ -64,7 +69,11 @@ public class KidsModeSettingsObserver extends ContentObserver {
}
@Override
public void onChange(boolean selfChange) {
public void onChange(boolean selfChange, @NonNull Collection<Uri> uris, int flags, int userId) {
if (userId != ActivityManager.getCurrentUser()) {
return;
}
if (mOnChangeRunnable != null) {
mOnChangeRunnable.run();
}

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

@@ -23,7 +23,10 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
import static android.view.Display.DEFAULT_DISPLAY;
import android.app.ActivityManager;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.res.Configuration;
import android.graphics.Rect;
import android.os.Binder;
@@ -87,6 +90,13 @@ public class KidsModeTaskOrganizer extends ShellTaskOrganizer {
private KidsModeSettingsObserver mKidsModeSettingsObserver;
private boolean mEnabled;
private final BroadcastReceiver mUserSwitchIntentReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
updateKidsModeState();
}
};
DisplayController.OnDisplaysChangedListener mOnDisplaysChangedListener =
new DisplayController.OnDisplaysChangedListener() {
@Override
@@ -169,12 +179,15 @@ public class KidsModeTaskOrganizer extends ShellTaskOrganizer {
public void initialize(StartingWindowController startingWindowController) {
initStartingWindow(startingWindowController);
if (mKidsModeSettingsObserver == null) {
mKidsModeSettingsObserver = new KidsModeSettingsObserver(
mMainHandler, mContext);
mKidsModeSettingsObserver = new KidsModeSettingsObserver(mMainHandler, mContext);
}
mKidsModeSettingsObserver.setOnChangeRunnable(() -> updateKidsModeState());
updateKidsModeState();
mKidsModeSettingsObserver.register();
final IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_USER_SWITCHED);
mContext.registerReceiverForAllUsers(mUserSwitchIntentReceiver, filter, null, mMainHandler);
}
@Override

17
services/core/java/com/android/server/wm/DisplayPolicy.java
View File

@@ -651,17 +651,19 @@ public class DisplayPolicy {
mForceShowNavBarSettingsObserver = new ForceShowNavBarSettingsObserver(
mHandler, mContext);
mForceShowNavBarSettingsObserver.setOnChangeRunnable(() -> {
synchronized (mLock) {
mForceShowNavigationBarEnabled =
mForceShowNavBarSettingsObserver.isEnabled();
updateSystemBarAttributes();
}
});
mForceShowNavBarSettingsObserver.setOnChangeRunnable(this::updateForceShowNavBarSettings);
mForceShowNavigationBarEnabled = mForceShowNavBarSettingsObserver.isEnabled();
mHandler.post(mForceShowNavBarSettingsObserver::register);
}
private void updateForceShowNavBarSettings() {
synchronized (mLock) {
mForceShowNavigationBarEnabled =
mForceShowNavBarSettingsObserver.isEnabled();
updateSystemBarAttributes();
}
}
/**
* Returns the first non-null alt bar window matching the given position.
*/
@@ -1801,6 +1803,7 @@ public class DisplayPolicy {
*/
public void switchUser() {
updateCurrentUserResources();
updateForceShowNavBarSettings();
}
/**