diff options
4 files changed, 45 insertions, 11 deletions
diff --git a/core/java/com/android/internal/policy/ForceShowNavBarSettingsObserver.java b/core/java/com/android/internal/policy/ForceShowNavBarSettingsObserver.java index fc064ea1ff10..4173abff9042 100644 --- a/core/java/com/android/internal/policy/ForceShowNavBarSettingsObserver.java +++ b/core/java/com/android/internal/policy/ForceShowNavBarSettingsObserver.java @@ -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(); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeSettingsObserver.java b/libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeSettingsObserver.java index f8f9d6b8f8a0..65cb7ac1e5f7 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeSettingsObserver.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeSettingsObserver.java @@ -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(); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizer.java index dc703583a449..b4c87b6cbf95 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizer.java @@ -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 diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java index 62998cb6bc40..d62bcdfd446b 100644 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java @@ -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(); } /** |