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

Commit a6d1e166 authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge "Use ComponentCallbacks instead of ConfigurationChangeListener" into udc-dev am: 7369ef1a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23148105



Change-Id: I1e53b2fda81a56269381532cc9beaa1d38a5653b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a3e6a3c2 7369ef1a

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+80 −48
Original line number Original line Diff line number Diff line
@@ -17,12 +17,18 @@ 
package com.android.wm.shell.bubbles;

package com.android.wm.shell.bubbles;





import static android.app.ActivityTaskManager.INVALID_TASK_ID;

import static android.app.ActivityTaskManager.INVALID_TASK_ID;

import static android.content.pm.ActivityInfo.CONFIG_ASSETS_PATHS;

import static android.content.pm.ActivityInfo.CONFIG_DENSITY;

import static android.content.pm.ActivityInfo.CONFIG_FONT_SCALE;

import static android.content.pm.ActivityInfo.CONFIG_LAYOUT_DIRECTION;

import static android.content.pm.ActivityInfo.CONFIG_UI_MODE;

import static android.service.notification.NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_DELETED;

import static android.service.notification.NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_DELETED;

import static android.service.notification.NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_UPDATED;

import static android.service.notification.NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_UPDATED;

import static android.service.notification.NotificationListenerService.REASON_CANCEL;

import static android.service.notification.NotificationListenerService.REASON_CANCEL;

import static android.view.View.INVISIBLE;

import static android.view.View.INVISIBLE;

import static android.view.View.VISIBLE;

import static android.view.View.VISIBLE;

import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;

import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;

import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;





import static com.android.wm.shell.bubbles.BubbleDebugConfig.DEBUG_BUBBLE_CONTROLLER;

import static com.android.wm.shell.bubbles.BubbleDebugConfig.DEBUG_BUBBLE_CONTROLLER;

import static com.android.wm.shell.bubbles.BubbleDebugConfig.DEBUG_BUBBLE_GESTURE;

import static com.android.wm.shell.bubbles.BubbleDebugConfig.DEBUG_BUBBLE_GESTURE;
@@ -47,6 +53,7 @@ import android.app.Notification; 
import android.app.NotificationChannel;

import android.app.NotificationChannel;

import android.app.PendingIntent;

import android.app.PendingIntent;

import android.content.BroadcastReceiver;

import android.content.BroadcastReceiver;

import android.content.ComponentCallbacks2;

import android.content.Context;

import android.content.Context;

import android.content.Intent;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.IntentFilter;
@@ -74,7 +81,6 @@ import android.util.Pair; 
import android.util.SparseArray;

import android.util.SparseArray;

import android.view.IWindowManager;

import android.view.IWindowManager;

import android.view.SurfaceControl;

import android.view.SurfaceControl;

import android.view.View;

import android.view.ViewGroup;

import android.view.ViewGroup;

import android.view.ViewRootImpl;

import android.view.ViewRootImpl;

import android.view.WindowInsets;

import android.view.WindowInsets;
@@ -102,6 +108,7 @@ import com.android.wm.shell.common.SingleInstanceRemoteListener; 
import com.android.wm.shell.common.SyncTransactionQueue;

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

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

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

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

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

import com.android.wm.shell.common.annotations.ExternalMainThread;

import com.android.wm.shell.common.annotations.ShellBackgroundThread;

import com.android.wm.shell.common.annotations.ShellBackgroundThread;

import com.android.wm.shell.common.annotations.ShellMainThread;

import com.android.wm.shell.common.annotations.ShellMainThread;

import com.android.wm.shell.common.bubbles.BubbleBarUpdate;

import com.android.wm.shell.common.bubbles.BubbleBarUpdate;
@@ -109,7 +116,6 @@ import com.android.wm.shell.draganddrop.DragAndDropController; 
import com.android.wm.shell.onehanded.OneHandedController;

import com.android.wm.shell.onehanded.OneHandedController;

import com.android.wm.shell.onehanded.OneHandedTransitionCallback;

import com.android.wm.shell.onehanded.OneHandedTransitionCallback;

import com.android.wm.shell.pip.PinnedStackListenerForwarder;

import com.android.wm.shell.pip.PinnedStackListenerForwarder;

import com.android.wm.shell.sysui.ConfigurationChangeListener;

import com.android.wm.shell.sysui.ShellCommandHandler;

import com.android.wm.shell.sysui.ShellCommandHandler;

import com.android.wm.shell.sysui.ShellController;

import com.android.wm.shell.sysui.ShellController;

import com.android.wm.shell.sysui.ShellInit;

import com.android.wm.shell.sysui.ShellInit;
@@ -135,7 +141,7 @@ import java.util.function.IntConsumer; 
 *

 *

 * The controller manages addition, removal, and visible state of bubbles on screen.

 * The controller manages addition, removal, and visible state of bubbles on screen.

 */

 */

public class BubbleController implements ConfigurationChangeListener,

public class BubbleController implements ComponentCallbacks2,

        RemoteCallable<BubbleController> {

        RemoteCallable<BubbleController> {





    private static final String TAG = TAG_WITH_CLASS_NAME ? "BubbleController" : TAG_BUBBLES;

    private static final String TAG = TAG_WITH_CLASS_NAME ? "BubbleController" : TAG_BUBBLES;
@@ -153,7 +159,6 @@ public class BubbleController implements ConfigurationChangeListener, 
    private static final boolean BUBBLE_BAR_ENABLED =

    private static final boolean BUBBLE_BAR_ENABLED =

            SystemProperties.getBoolean("persist.wm.debug.bubble_bar", false);

            SystemProperties.getBoolean("persist.wm.debug.bubble_bar", false);







    /**

    /**

     * Common interface to send updates to bubble views.

     * Common interface to send updates to bubble views.

     */

     */
@@ -237,17 +242,17 @@ public class BubbleController implements ConfigurationChangeListener, 
    /** Whether or not the BubbleStackView has been added to the WindowManager. */

    /** Whether or not the BubbleStackView has been added to the WindowManager. */

    private boolean mAddedToWindowManager = false;

    private boolean mAddedToWindowManager = false;





    /** Saved screen density, used to detect display size changes in {@link #onConfigChanged}. */

    /**

    private int mDensityDpi = Configuration.DENSITY_DPI_UNDEFINED;

     * Saved configuration, used to detect changes in



     * {@link #onConfigurationChanged(Configuration)}

    /** Saved screen bounds, used to detect screen size changes in {@link #onConfigChanged}. **/

     */

    private Rect mScreenBounds = new Rect();

    private final Configuration mLastConfiguration = new Configuration();



    /** Saved font scale, used to detect font size changes in {@link #onConfigChanged}. */

    private float mFontScale = 0;





    /** Saved direction, used to detect layout direction changes @link #onConfigChanged}. */

    /**

    private int mLayoutDirection = View.LAYOUT_DIRECTION_UNDEFINED;

     * Saved screen bounds, used to detect screen size changes in

     * {@link #onConfigurationChanged(Configuration)}.

     */

    private final Rect mScreenBounds = new Rect();





    /** Saved insets, used to detect WindowInset changes. */

    /** Saved insets, used to detect WindowInset changes. */

    private WindowInsets mWindowInsets;

    private WindowInsets mWindowInsets;
@@ -293,7 +298,8 @@ public class BubbleController implements ConfigurationChangeListener, 
            TaskViewTransitions taskViewTransitions,

            TaskViewTransitions taskViewTransitions,

            SyncTransactionQueue syncQueue,

            SyncTransactionQueue syncQueue,

            IWindowManager wmService) {

            IWindowManager wmService) {

        mContext = context;

        mContext = context.createWindowContext(TYPE_APPLICATION_OVERLAY, null);

        mLastConfiguration.setTo(mContext.getResources().getConfiguration());

        mShellCommandHandler = shellCommandHandler;

        mShellCommandHandler = shellCommandHandler;

        mShellController = shellController;

        mShellController = shellController;

        mLauncherApps = launcherApps;

        mLauncherApps = launcherApps;
@@ -317,11 +323,11 @@ public class BubbleController implements ConfigurationChangeListener, 
        mBubblePositioner = positioner;

        mBubblePositioner = positioner;

        mBubbleData = data;

        mBubbleData = data;

        mSavedUserBubbleData = new SparseArray<>();

        mSavedUserBubbleData = new SparseArray<>();

        mBubbleIconFactory = new BubbleIconFactory(context,

        mBubbleIconFactory = new BubbleIconFactory(mContext,

                context.getResources().getDimensionPixelSize(R.dimen.bubble_size),

                mContext.getResources().getDimensionPixelSize(R.dimen.bubble_size),

                context.getResources().getDimensionPixelSize(R.dimen.bubble_badge_size),

                mContext.getResources().getDimensionPixelSize(R.dimen.bubble_badge_size),

                context.getResources().getColor(R.color.important_conversation),

                mContext.getResources().getColor(R.color.important_conversation),

                context.getResources().getDimensionPixelSize(

                mContext.getResources().getDimensionPixelSize(

                        com.android.internal.R.dimen.importance_ring_stroke_width));

                        com.android.internal.R.dimen.importance_ring_stroke_width));

        mDisplayController = displayController;

        mDisplayController = displayController;

        mTaskViewTransitions = taskViewTransitions;

        mTaskViewTransitions = taskViewTransitions;
@@ -482,7 +488,6 @@ public class BubbleController implements ConfigurationChangeListener, 
        }

        }

        mCurrentProfiles = userProfiles;

        mCurrentProfiles = userProfiles;





        mShellController.addConfigurationChangeListener(this);

        mShellController.addExternalInterface(KEY_EXTRA_SHELL_BUBBLES,

        mShellController.addExternalInterface(KEY_EXTRA_SHELL_BUBBLES,

                this::createExternalInterface, this);

                this::createExternalInterface, this);

        mShellCommandHandler.addDumpCallback(this::dump, this);

        mShellCommandHandler.addDumpCallback(this::dump, this);
@@ -774,6 +779,7 @@ public class BubbleController implements ConfigurationChangeListener, 
        try {

        try {

            mAddedToWindowManager = true;

            mAddedToWindowManager = true;

            registerBroadcastReceiver();

            registerBroadcastReceiver();

            mContext.registerComponentCallbacks(this);

            mBubbleData.getOverflow().initialize(this);

            mBubbleData.getOverflow().initialize(this);

            // (TODO: b/273314541) some duplication in the inset listener

            // (TODO: b/273314541) some duplication in the inset listener

            if (isShowingAsBubbleBar()) {

            if (isShowingAsBubbleBar()) {
@@ -831,6 +837,7 @@ public class BubbleController implements ConfigurationChangeListener, 
        // Put on background for this binder call, was causing jank

        // Put on background for this binder call, was causing jank

        mBackgroundExecutor.execute(() -> {

        mBackgroundExecutor.execute(() -> {

            try {

            try {

                mContext.unregisterComponentCallbacks(this);

                mContext.unregisterReceiver(mBroadcastReceiver);

                mContext.unregisterReceiver(mBroadcastReceiver);

            } catch (IllegalArgumentException e) {

            } catch (IllegalArgumentException e) {

                // Not sure if this happens in production, but was happening in tests

                // Not sure if this happens in production, but was happening in tests
@@ -930,8 +937,7 @@ public class BubbleController implements ConfigurationChangeListener, 
        mSavedUserBubbleData.remove(userId);

        mSavedUserBubbleData.remove(userId);

    }

    }





    @Override

    private void onThemeChanged() {

    public void onThemeChanged() {

        if (mStackView != null) {

        if (mStackView != null) {

            mStackView.onThemeChanged();

            mStackView.onThemeChanged();

        }

        }
@@ -963,34 +969,60 @@ public class BubbleController implements ConfigurationChangeListener, 
        }

        }

    }

    }





    // Note: Component callbacks are always called on the main thread of the process

    @ExternalMainThread

    @Override

    @Override

    public void onConfigurationChanged(Configuration newConfig) {

    public void onConfigurationChanged(Configuration newConfig) {

        mMainExecutor.execute(() -> {

            final int diff = newConfig.diff(mLastConfiguration);

            final boolean themeChanged = (diff & CONFIG_ASSETS_PATHS) != 0

                    || (diff & CONFIG_UI_MODE) != 0;

            if (themeChanged) {

                onThemeChanged();

            }

            if (mBubblePositioner != null) {

            if (mBubblePositioner != null) {

                mBubblePositioner.update();

                mBubblePositioner.update();

            }

            }

        if (mStackView != null && newConfig != null) {

            if (mStackView != null) {

            if (newConfig.densityDpi != mDensityDpi

                final boolean densityChanged = (diff & CONFIG_DENSITY) != 0;

                final boolean fontScaleChanged = (diff & CONFIG_FONT_SCALE) != 0;

                final boolean layoutDirectionChanged = (diff & CONFIG_LAYOUT_DIRECTION) != 0;

                if (densityChanged

                        || !newConfig.windowConfiguration.getBounds().equals(mScreenBounds)) {

                        || !newConfig.windowConfiguration.getBounds().equals(mScreenBounds)) {

                mDensityDpi = newConfig.densityDpi;

                    mScreenBounds.set(newConfig.windowConfiguration.getBounds());

                    mScreenBounds.set(newConfig.windowConfiguration.getBounds());

                    mBubbleData.onMaxBubblesChanged();

                    mBubbleData.onMaxBubblesChanged();

                    mBubbleIconFactory = new BubbleIconFactory(mContext,

                    mBubbleIconFactory = new BubbleIconFactory(mContext,

                            mContext.getResources().getDimensionPixelSize(R.dimen.bubble_size),

                            mContext.getResources().getDimensionPixelSize(R.dimen.bubble_size),

                        mContext.getResources().getDimensionPixelSize(R.dimen.bubble_badge_size),

                            mContext.getResources().getDimensionPixelSize(

                                    R.dimen.bubble_badge_size),

                            mContext.getResources().getColor(R.color.important_conversation),

                            mContext.getResources().getColor(R.color.important_conversation),

                            mContext.getResources().getDimensionPixelSize(

                            mContext.getResources().getDimensionPixelSize(

                                    com.android.internal.R.dimen.importance_ring_stroke_width));

                                    com.android.internal.R.dimen.importance_ring_stroke_width));

                    mStackView.onDisplaySizeChanged();

                    mStackView.onDisplaySizeChanged();

                }

                }

            if (newConfig.fontScale != mFontScale) {

                if (fontScaleChanged) {

                mFontScale = newConfig.fontScale;

                    mStackView.updateFontScale();

                    mStackView.updateFontScale();

                }

                }

            if (newConfig.getLayoutDirection() != mLayoutDirection) {

                if (layoutDirectionChanged) {

                mLayoutDirection = newConfig.getLayoutDirection();

                    mStackView.onLayoutDirectionChanged(newConfig.getLayoutDirection());

                mStackView.onLayoutDirectionChanged(mLayoutDirection);

                }

            }

            }

            mLastConfiguration.setTo(newConfig);

        });

    }



    // Note: Component callbacks are always called on the main thread of the process

    @ExternalMainThread

    @Override

    public void onTrimMemory(int level) {

        // Do nothing

    }

    }



    // Note: Component callbacks are always called on the main thread of the process

    @ExternalMainThread

    @Override

    public void onLowMemory() {

        // Do nothing

    }

    }





    private void onNotificationPanelExpandedChanged(boolean expanded) {

    private void onNotificationPanelExpandedChanged(boolean expanded) {