Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40272773 authored by shawnlin's avatar shawnlin
Browse files

Move kids mode relative logic to wm shell 

1. Move KidsModeSettingsObservor to wm shell.
2. Create a ForceShowNavBarSettingsOberver for wm core.

Bug: 230072077
Test: atest KidsModeTaskOrganizerTest
Change-Id: I1b3edf1fc804b9dac190fcc92b7b62bfc3366d64
parent 9f46a6ec

core/java/com/android/internal/policy/ForceShowNavBarSettingsObserver.java

0 → 100644
+75 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 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.internal.policy;



import android.content.ContentResolver;

import android.content.Context;

import android.database.ContentObserver;

import android.os.Handler;

import android.os.UserHandle;

import android.provider.Settings;



/**

 * A ContentObserver for listening {@link Settings.Secure#NAV_BAR_FORCE_VISIBLE} setting key.

 *

 * @hide

 */

public class ForceShowNavBarSettingsObserver extends ContentObserver {

    private Context mContext;

    private Runnable mOnChangeRunnable;



    public ForceShowNavBarSettingsObserver(Handler handler, Context context) {

        super(handler);

        mContext = context;

    }



    public void setOnChangeRunnable(Runnable r) {

        mOnChangeRunnable = r;

    }



    /**

     * Registers the observer.

     */

    public void register() {

        final ContentResolver r = mContext.getContentResolver();

        r.registerContentObserver(

                Settings.Secure.getUriFor(Settings.Secure.NAV_BAR_FORCE_VISIBLE),

                false, this, UserHandle.USER_ALL);

    }



    /**

     * Unregisters the observer.

     */

    public void unregister() {

        mContext.getContentResolver().unregisterContentObserver(this);

    }



    @Override

    public void onChange(boolean selfChange) {

        if (mOnChangeRunnable != null) {

            mOnChangeRunnable.run();

        }

    }



    /**

     * Returns true only when it's in orce show navigation bar mode. Otherwise, return false.

     */

    public boolean isEnabled() {

        return Settings.Secure.getIntForUser(mContext.getContentResolver(),

                Settings.Secure.NAV_BAR_FORCE_VISIBLE, 0, UserHandle.USER_CURRENT) == 1;

    }

}

core/java/com/android/internal/policy/KidsModeSettingsObserver.java→libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeSettingsObserver.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.internal.policy;

package com.android.wm.shell.kidsmode;



import android.content.ContentResolver;

import android.content.Context;

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

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import android.window.WindowContainerTransaction; 
import androidx.annotation.NonNull;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.policy.KidsModeSettingsObserver;

import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.common.DisplayController;

import com.android.wm.shell.common.DisplayInsetsController;

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizerTest.java

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import android.window.WindowContainerTransaction; 
import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;



import com.android.internal.policy.KidsModeSettingsObserver;

import com.android.wm.shell.common.DisplayController;

import com.android.wm.shell.common.DisplayInsetsController;

import com.android.wm.shell.common.ShellExecutor;

services/core/java/com/android/server/wm/DisplayPolicy.java

+8 −8
Original line number Diff line number Diff line
@@ -138,8 +138,8 @@ import android.window.ClientWindowFrames; 


import com.android.internal.R;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.policy.ForceShowNavBarSettingsObserver;

import com.android.internal.policy.GestureNavigationSettingsObserver;

import com.android.internal.policy.KidsModeSettingsObserver;

import com.android.internal.policy.ScreenDecorationsUtils;

import com.android.internal.policy.SystemBarUtils;

import com.android.internal.protolog.common.ProtoLog;
@@ -378,7 +378,7 @@ public class DisplayPolicy { 


    private final WindowManagerInternal.AppTransitionListener mAppTransitionListener;



    private final KidsModeSettingsObserver mKidsModeSettingsObserver;

    private final ForceShowNavBarSettingsObserver mForceShowNavBarSettingsObserver;

    private boolean mForceShowNavigationBarEnabled;



    private class PolicyHandler extends Handler {
@@ -653,17 +653,17 @@ public class DisplayPolicy { 
        });

        mHandler.post(mGestureNavigationSettingsObserver::register);



        mKidsModeSettingsObserver = new KidsModeSettingsObserver(

        mForceShowNavBarSettingsObserver = new ForceShowNavBarSettingsObserver(

                mHandler, mContext);

        mKidsModeSettingsObserver.setOnChangeRunnable(() -> {

        mForceShowNavBarSettingsObserver.setOnChangeRunnable(() -> {

            synchronized (mLock) {

                mForceShowNavigationBarEnabled =

                        mKidsModeSettingsObserver.isEnabled();

                        mForceShowNavBarSettingsObserver.isEnabled();

                updateSystemBarAttributes();

            }

        });

        mForceShowNavigationBarEnabled = mKidsModeSettingsObserver.isEnabled();

        mHandler.post(mKidsModeSettingsObserver::register);

        mForceShowNavigationBarEnabled = mForceShowNavBarSettingsObserver.isEnabled();

        mHandler.post(mForceShowNavBarSettingsObserver::register);

    }



    /**
@@ -2861,7 +2861,7 @@ public class DisplayPolicy { 
    void release() {

        mDisplayContent.mTransitionController.unregisterLegacyListener(mAppTransitionListener);

        mHandler.post(mGestureNavigationSettingsObserver::unregister);

        mHandler.post(mKidsModeSettingsObserver::unregister);

        mHandler.post(mForceShowNavBarSettingsObserver::unregister);

        mImmersiveModeConfirmation.release();

    }