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

Commit d88edf91 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove Dependency.get(MAIN_HANDLER) from NotificationGutsManager"

parents 92350627 5fe07f70
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.service.dreams.IDreamManager;
import android.view.IWindowManager;
import android.view.WindowManager;
import android.view.WindowManagerGlobal;
import android.view.accessibility.AccessibilityManager;

import com.android.internal.statusbar.IStatusBarService;
import com.android.internal.util.LatencyTracker;
@@ -54,6 +55,11 @@ import dagger.Provides;
 */
@Module
public class SystemServicesModule {
    @Provides
    @Singleton
    static AccessibilityManager provideAccessibilityManager(Context context) {
        return context.getSystemService(AccessibilityManager.class);
    }

    @Singleton
    @Provides
+8 −4
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.os.ServiceManager;
import android.os.UserHandle;
import android.provider.Settings;
@@ -41,6 +42,7 @@ import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto;
import com.android.systemui.Dependency;
import com.android.systemui.Dumpable;
import com.android.systemui.dagger.qualifiers.MainHandler;
import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin;
import com.android.systemui.plugins.statusbar.StatusBarStateController;
import com.android.systemui.statusbar.NotificationLifetimeExtender;
@@ -101,16 +103,18 @@ public class NotificationGutsManager implements Dumpable, NotificationLifetimeEx
    protected String mKeyToRemoveOnGutsClosed;

    private final Lazy<StatusBar> mStatusBarLazy;
    private final Handler mMainHandler;
    private Runnable mOpenRunnable;

    @Inject
    public NotificationGutsManager(Context context, VisualStabilityManager visualStabilityManager,
            Lazy<StatusBar> statusBarLazy) {
            Lazy<StatusBar> statusBarLazy, @MainHandler Handler mainHandler,
            AccessibilityManager accessibilityManager) {
        mContext = context;
        mVisualStabilityManager = visualStabilityManager;
        mStatusBarLazy = statusBarLazy;
        mAccessibilityManager = (AccessibilityManager)
                mContext.getSystemService(Context.ACCESSIBILITY_SERVICE);
        mMainHandler = mainHandler;
        mAccessibilityManager = accessibilityManager;
    }

    public void setUpWithPresenter(NotificationPresenter presenter,
@@ -389,7 +393,7 @@ public class NotificationGutsManager implements Dumpable, NotificationLifetimeEx
                        .setLeaveOpenOnKeyguardHide(true);
            }

            Runnable r = () -> Dependency.get(Dependency.MAIN_HANDLER).post(
            Runnable r = () -> mMainHandler.post(
                    () -> openGutsInternal(view, x, y, menuItem));

            mStatusBarLazy.get().executeRunnableDismissingKeyguard(
+4 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper;
import android.util.ArraySet;
import android.view.View;
import android.view.accessibility.AccessibilityManager;

import androidx.test.filters.SmallTest;

@@ -110,6 +111,7 @@ public class NotificationGutsManagerTest extends SysuiTestCase {
    @Mock private OnSettingsClickListener mOnSettingsClickListener;
    @Mock private DeviceProvisionedController mDeviceProvisionedController;
    @Mock private StatusBar mStatusBar;
    @Mock private AccessibilityManager mAccessibilityManager;

    @Before
    public void setUp() {
@@ -122,9 +124,10 @@ public class NotificationGutsManagerTest extends SysuiTestCase {
        mDependency.injectMockDependency(NotificationLockscreenUserManager.class);
        mHandler = Handler.createAsync(mTestableLooper.getLooper());
        mHelper = new NotificationTestHelper(mContext, mDependency);
        when(mAccessibilityManager.isTouchExplorationEnabled()).thenReturn(false);

        mGutsManager = new NotificationGutsManager(mContext, mVisualStabilityManager,
                () -> mStatusBar);
                () -> mStatusBar, mHandler, mAccessibilityManager);
        mGutsManager.setUpWithPresenter(mPresenter, mStackScroller,
                mCheckSaveListener, mOnSettingsClickListener);
        mGutsManager.setNotificationActivityStarter(mNotificationActivityStarter);