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

Commit 8a3eece5 authored by Alex Stetson's avatar Alex Stetson
Browse files

Add centralized DisplayTracker for SystemUI 

In multi-user multi-display systems where there could be multiple
SystemUI instances running, the concept of what displays are relevant
for a particular SystemUI may change. By adding a DisplayTracker class
to abstract away display retrieval and callbacks, these instances can
return the information that is most accurate for them.

Bug: 256236871
Test: atest SystemUITests
Change-Id: I51c1a380a344fb45d5e0de2c5c6ba5610733a3a2
parent 729d0a62

packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java

+31 −33
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
 */

package com.android.keyguard;



import static android.view.Display.DEFAULT_DISPLAY;



import android.app.Presentation;

import android.content.Context;

import android.graphics.Color;
@@ -37,9 +35,11 @@ import android.view.WindowManager; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.keyguard.dagger.KeyguardStatusViewComponent;

import com.android.systemui.R;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.dagger.qualifiers.UiBackground;

import com.android.systemui.navigationbar.NavigationBarController;

import com.android.systemui.navigationbar.NavigationBarView;

import com.android.systemui.settings.DisplayTracker;



import java.util.concurrent.Executor;
@@ -53,6 +53,7 @@ public class KeyguardDisplayManager { 


    private MediaRouter mMediaRouter = null;

    private final DisplayManager mDisplayService;

    private final DisplayTracker mDisplayTracker;

    private final Lazy<NavigationBarController> mNavigationBarControllerLazy;

    private final KeyguardStatusViewComponent.Factory mKeyguardStatusViewComponentFactory;

    private final Context mContext;
@@ -62,9 +63,8 @@ public class KeyguardDisplayManager { 


    private final SparseArray<Presentation> mPresentations = new SparseArray<>();



    private final DisplayManager.DisplayListener mDisplayListener =

            new DisplayManager.DisplayListener() {



    private final DisplayTracker.Callback mDisplayCallback =

            new DisplayTracker.Callback() {

                @Override

                public void onDisplayAdded(int displayId) {

                    Trace.beginSection(
@@ -77,11 +77,6 @@ public class KeyguardDisplayManager { 
                    Trace.endSection();

                }



        @Override

        public void onDisplayChanged(int displayId) {



        }



                @Override

                public void onDisplayRemoved(int displayId) {

                    Trace.beginSection(
@@ -95,13 +90,16 @@ public class KeyguardDisplayManager { 
    public KeyguardDisplayManager(Context context,

            Lazy<NavigationBarController> navigationBarControllerLazy,

            KeyguardStatusViewComponent.Factory keyguardStatusViewComponentFactory,

            DisplayTracker displayTracker,

            @Main Executor mainExecutor,

            @UiBackground Executor uiBgExecutor) {

        mContext = context;

        mNavigationBarControllerLazy = navigationBarControllerLazy;

        mKeyguardStatusViewComponentFactory = keyguardStatusViewComponentFactory;

        uiBgExecutor.execute(() -> mMediaRouter = mContext.getSystemService(MediaRouter.class));

        mDisplayService = mContext.getSystemService(DisplayManager.class);

        mDisplayService.registerDisplayListener(mDisplayListener, null /* handler */);

        mDisplayTracker = displayTracker;

        mDisplayTracker.addDisplayChangeCallback(mDisplayCallback, mainExecutor);

    }



    private boolean isKeyguardShowable(Display display) {
@@ -109,7 +107,7 @@ public class KeyguardDisplayManager { 
            if (DEBUG) Log.i(TAG, "Cannot show Keyguard on null display");

            return false;

        }

        if (display.getDisplayId() == DEFAULT_DISPLAY) {

        if (display.getDisplayId() == mDisplayTracker.getDefaultDisplayId()) {

            if (DEBUG) Log.i(TAG, "Do not show KeyguardPresentation on the default display");

            return false;

        }
@@ -224,7 +222,7 @@ public class KeyguardDisplayManager { 
    protected boolean updateDisplays(boolean showing) {

        boolean changed = false;

        if (showing) {

            final Display[] displays = mDisplayService.getDisplays();

            final Display[] displays = mDisplayTracker.getAllDisplays();

            for (Display display : displays) {

                int displayId = display.getDisplayId();

                updateNavigationBarVisibility(displayId, false /* navBarVisible */);
@@ -247,7 +245,7 @@ public class KeyguardDisplayManager { 
    //  term solution in R.

    private void updateNavigationBarVisibility(int displayId, boolean navBarVisible) {

        // Leave this task to {@link StatusBarKeyguardViewManager}

        if (displayId == DEFAULT_DISPLAY) return;

        if (displayId == mDisplayTracker.getDefaultDisplayId()) return;



        NavigationBarView navBarView = mNavigationBarControllerLazy.get()

                .getNavigationBarView(displayId);

packages/SystemUI/src/com/android/keyguard/KeyguardSliceViewController.java

+7 −4
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.keyguard;



import static android.app.slice.Slice.HINT_LIST_ITEM;

import static android.view.Display.DEFAULT_DISPLAY;



import android.app.PendingIntent;

import android.net.Uri;
@@ -43,6 +42,7 @@ import com.android.systemui.Dumpable; 
import com.android.systemui.dump.DumpManager;

import com.android.systemui.keyguard.KeyguardSliceProvider;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.settings.DisplayTracker;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.tuner.TunerService;

import com.android.systemui.util.ViewController;
@@ -64,6 +64,7 @@ public class KeyguardSliceViewController extends ViewController<KeyguardSliceVie 
    private final ConfigurationController mConfigurationController;

    private final TunerService mTunerService;

    private final DumpManager mDumpManager;

    private final DisplayTracker mDisplayTracker;

    private int mDisplayId;

    private LiveData<Slice> mLiveData;

    private Uri mKeyguardSliceUri;
@@ -108,12 +109,14 @@ public class KeyguardSliceViewController extends ViewController<KeyguardSliceVie 
            ActivityStarter activityStarter,

            ConfigurationController configurationController,

            TunerService tunerService,

            DumpManager dumpManager) {

            DumpManager dumpManager,

            DisplayTracker displayTracker) {

        super(keyguardSliceView);

        mActivityStarter = activityStarter;

        mConfigurationController = configurationController;

        mTunerService = tunerService;

        mDumpManager = dumpManager;

        mDisplayTracker = displayTracker;

    }



    @Override
@@ -124,7 +127,7 @@ public class KeyguardSliceViewController extends ViewController<KeyguardSliceVie 
        }

        mTunerService.addTunable(mTunable, Settings.Secure.KEYGUARD_SLICE_URI);

        // Make sure we always have the most current slice

        if (mDisplayId == DEFAULT_DISPLAY && mLiveData != null) {

        if (mDisplayId == mDisplayTracker.getDefaultDisplayId() && mLiveData != null) {

            mLiveData.observeForever(mObserver);

        }

        mConfigurationController.addCallback(mConfigurationListener);
@@ -137,7 +140,7 @@ public class KeyguardSliceViewController extends ViewController<KeyguardSliceVie 
    @Override

    protected void onViewDetached() {

        // TODO(b/117344873) Remove below work around after this issue be fixed.

        if (mDisplayId == DEFAULT_DISPLAY) {

        if (mDisplayId == mDisplayTracker.getDefaultDisplayId()) {

            mLiveData.removeObserver(mObserver);

        }

        mTunerService.removeTunable(mTunable);

packages/SystemUI/src/com/android/systemui/ScreenDecorations.java

+8 −17
Original line number Diff line number Diff line
@@ -36,10 +36,10 @@ import android.graphics.Path; 
import android.graphics.PixelFormat;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import android.hardware.display.DisplayManager;

import android.hardware.graphics.common.AlphaInterpretation;

import android.hardware.graphics.common.DisplayDecorationSupport;

import android.os.Handler;

import android.os.HandlerExecutor;

import android.os.SystemProperties;

import android.os.Trace;

import android.provider.Settings.Secure;
@@ -76,6 +76,7 @@ import com.android.systemui.decor.PrivacyDotDecorProviderFactory; 
import com.android.systemui.decor.RoundedCornerDecorProviderFactory;

import com.android.systemui.decor.RoundedCornerResDelegate;

import com.android.systemui.qs.SettingObserver;

import com.android.systemui.settings.DisplayTracker;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.statusbar.events.PrivacyDotViewController;

import com.android.systemui.tuner.TunerService;
@@ -120,7 +121,7 @@ public class ScreenDecorations implements CoreStartable, Tunable , Dumpable { 
            R.id.display_cutout_bottom

    };



    private DisplayManager mDisplayManager;

    private DisplayTracker mDisplayTracker;

    @VisibleForTesting

    protected boolean mIsRegistered;

    private final Context mContext;
@@ -128,7 +129,7 @@ public class ScreenDecorations implements CoreStartable, Tunable , Dumpable { 
    private final TunerService mTunerService;

    private final SecureSettings mSecureSettings;

    @VisibleForTesting

    DisplayManager.DisplayListener mDisplayListener;

    DisplayTracker.Callback mDisplayListener;

    private CameraAvailabilityListener mCameraListener;

    private final UserTracker mUserTracker;

    private final PrivacyDotViewController mDotViewController;
@@ -302,6 +303,7 @@ public class ScreenDecorations implements CoreStartable, Tunable , Dumpable { 
            SecureSettings secureSettings,

            TunerService tunerService,

            UserTracker userTracker,

            DisplayTracker displayTracker,

            PrivacyDotViewController dotViewController,

            ThreadFactory threadFactory,

            PrivacyDotDecorProviderFactory dotFactory,
@@ -311,6 +313,7 @@ public class ScreenDecorations implements CoreStartable, Tunable , Dumpable { 
        mSecureSettings = secureSettings;

        mTunerService = tunerService;

        mUserTracker = userTracker;

        mDisplayTracker = displayTracker;

        mDotViewController = dotViewController;

        mThreadFactory = threadFactory;

        mDotFactory = dotFactory;
@@ -376,7 +379,6 @@ public class ScreenDecorations implements CoreStartable, Tunable , Dumpable { 
    private void startOnScreenDecorationsThread() {

        Trace.beginSection("ScreenDecorations#startOnScreenDecorationsThread");

        mWindowManager = mContext.getSystemService(WindowManager.class);

        mDisplayManager = mContext.getSystemService(DisplayManager.class);

        mContext.getDisplay().getDisplayInfo(mDisplayInfo);

        mRotation = mDisplayInfo.rotation;

        mDisplayMode = mDisplayInfo.getMode();
@@ -393,17 +395,7 @@ public class ScreenDecorations implements CoreStartable, Tunable , Dumpable { 
        setupDecorations();

        setupCameraListener();



        mDisplayListener = new DisplayManager.DisplayListener() {

            @Override

            public void onDisplayAdded(int displayId) {

                // do nothing

            }



            @Override

            public void onDisplayRemoved(int displayId) {

                // do nothing

            }



        mDisplayListener = new DisplayTracker.Callback() {

            @Override

            public void onDisplayChanged(int displayId) {

                mContext.getDisplay().getDisplayInfo(mDisplayInfo);
@@ -474,8 +466,7 @@ public class ScreenDecorations implements CoreStartable, Tunable , Dumpable { 
                }

            }

        };



        mDisplayManager.registerDisplayListener(mDisplayListener, mHandler);

        mDisplayTracker.addDisplayChangeCallback(mDisplayListener, new HandlerExecutor(mHandler));

        updateConfiguration();

        Trace.endSection();

    }

packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java

+6 −3
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import android.os.PowerManager; 
import android.os.RemoteException;

import android.os.SystemClock;

import android.util.Log;

import android.view.Display;

import android.view.IWindowManager;

import android.view.InputDevice;

import android.view.KeyCharacterMap;
@@ -50,6 +49,7 @@ import com.android.internal.util.ScreenshotHelper; 
import com.android.systemui.CoreStartable;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.recents.Recents;

import com.android.systemui.settings.DisplayTracker;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.statusbar.CommandQueue;
@@ -180,6 +180,7 @@ public class SystemActions implements CoreStartable { 
    private final Context mContext;

    private final UserTracker mUserTracker;

    private final Optional<Recents> mRecentsOptional;

    private final DisplayTracker mDisplayTracker;

    private Locale mLocale;

    private final AccessibilityManager mA11yManager;

    private final Lazy<Optional<CentralSurfaces>> mCentralSurfacesOptionalLazy;
@@ -194,11 +195,13 @@ public class SystemActions implements CoreStartable { 
            NotificationShadeWindowController notificationShadeController,

            ShadeController shadeController,

            Lazy<Optional<CentralSurfaces>> centralSurfacesOptionalLazy,

            Optional<Recents> recentsOptional) {

            Optional<Recents> recentsOptional,

            DisplayTracker displayTracker) {

        mContext = context;

        mUserTracker = userTracker;

        mShadeController = shadeController;

        mRecentsOptional = recentsOptional;

        mDisplayTracker = displayTracker;

        mReceiver = new SystemActionsBroadcastReceiver();

        mLocale = mContext.getResources().getConfiguration().getLocales().get(0);

        mA11yManager = (AccessibilityManager) mContext.getSystemService(
@@ -523,7 +526,7 @@ public class SystemActions implements CoreStartable { 


    private void handleAccessibilityButton() {

        AccessibilityManager.getInstance(mContext).notifyAccessibilityButtonClicked(

                Display.DEFAULT_DISPLAY);

                mDisplayTracker.getDefaultDisplayId());

    }



    private void handleAccessibilityButtonChooser() {

packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnification.java

+6 −3
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import com.android.systemui.dagger.SysUISingleton; 
import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.model.SysUiState;

import com.android.systemui.recents.OverviewProxyService;

import com.android.systemui.settings.DisplayTracker;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.util.settings.SecureSettings;
@@ -64,6 +65,7 @@ public class WindowMagnification implements CoreStartable, WindowMagnifierCallba 
    private final AccessibilityManager mAccessibilityManager;

    private final CommandQueue mCommandQueue;

    private final OverviewProxyService mOverviewProxyService;

    private final DisplayTracker mDisplayTracker;



    private WindowMagnificationConnectionImpl mWindowMagnificationConnectionImpl;

    private SysUiState mSysUiState;
@@ -115,7 +117,7 @@ public class WindowMagnification implements CoreStartable, WindowMagnifierCallba 
    public WindowMagnification(Context context, @Main Handler mainHandler,

            CommandQueue commandQueue, ModeSwitchesController modeSwitchesController,

            SysUiState sysUiState, OverviewProxyService overviewProxyService,

            SecureSettings secureSettings) {

            SecureSettings secureSettings, DisplayTracker displayTracker) {

        mContext = context;

        mHandler = mainHandler;

        mAccessibilityManager = mContext.getSystemService(AccessibilityManager.class);
@@ -123,6 +125,7 @@ public class WindowMagnification implements CoreStartable, WindowMagnifierCallba 
        mModeSwitchesController = modeSwitchesController;

        mSysUiState = sysUiState;

        mOverviewProxyService = overviewProxyService;

        mDisplayTracker = displayTracker;

        mMagnificationControllerSupplier = new ControllerSupplier(context,

                mHandler, this, context.getSystemService(DisplayManager.class), sysUiState,

                secureSettings);
@@ -144,14 +147,14 @@ public class WindowMagnification implements CoreStartable, WindowMagnifierCallba 
    private void updateSysUiStateFlag() {

        //TODO(b/187510533): support multi-display once SysuiState supports it.

        final WindowMagnificationController controller =

                mMagnificationControllerSupplier.valueAt(Display.DEFAULT_DISPLAY);

                mMagnificationControllerSupplier.valueAt(mDisplayTracker.getDefaultDisplayId());

        if (controller != null) {

            controller.updateSysUIStateFlag();

        } else {

            // The instance is initialized when there is an IPC request. Considering

            // self-crash cases, we need to reset the flag in such situation.

            mSysUiState.setFlag(SYSUI_STATE_MAGNIFICATION_OVERLAP, false)

                    .commitUpdate(Display.DEFAULT_DISPLAY);

                    .commitUpdate(mDisplayTracker.getDefaultDisplayId());

        }

    }