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

Commit 8b3758ec authored by Bruno Martins's avatar Bruno Martins
Browse files

fixup! SystemUI: Add double tap to sleep gesture 

This fixes SystemUI-tests compilation.

Change-Id: Ia81060d966b6adef8d50963c21068ceb12854718
parent cfdbe732

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+2 −3
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.animation.ValueAnimator; 
import android.app.ActivityManager;

import android.app.Fragment;

import android.app.StatusBarManager;

import android.content.Context;

import android.content.pm.ResolveInfo;

import android.content.res.Configuration;

import android.graphics.Canvas;
@@ -511,7 +510,7 @@ public class NotificationPanelViewController extends PanelViewController { 
            MediaHierarchyManager mediaHierarchyManager,

            BiometricUnlockController biometricUnlockController,

            StatusBarKeyguardViewManager statusBarKeyguardViewManager,

            TunerService tunerService, Context context) {

            TunerService tunerService) {

        super(view, falsingManager, dozeLog, keyguardStateController,

                (SysuiStatusBarStateController) statusBarStateController, vibratorHelper,

                latencyTracker, flingAnimationUtilsBuilder, statusBarTouchableRegionManager);
@@ -570,7 +569,7 @@ public class NotificationPanelViewController extends PanelViewController { 
        });

        mBottomAreaShadeAlphaAnimator.setDuration(160);

        mBottomAreaShadeAlphaAnimator.setInterpolator(Interpolators.ALPHA_OUT);

        mDoubleTapGesture = new GestureDetector(context,

        mDoubleTapGesture = new GestureDetector(mView.getContext(),

                new GestureDetector.SimpleOnGestureListener() {

            @Override

            public boolean onDoubleTap(MotionEvent e) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowViewController.java

+2 −4
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.systemui.statusbar.phone; 
import static android.app.StatusBarManager.WINDOW_STATE_SHOWING;



import android.app.StatusBarManager;

import android.content.Context;

import android.graphics.RectF;

import android.hardware.display.AmbientDisplayConfiguration;

import android.media.AudioManager;
@@ -139,8 +138,7 @@ public class NotificationShadeWindowViewController { 
            NotificationShadeDepthController depthController,

            NotificationShadeWindowView notificationShadeWindowView,

            NotificationPanelViewController notificationPanelViewController,

            SuperStatusBarViewFactory statusBarViewFactory,

            Context context) {

            SuperStatusBarViewFactory statusBarViewFactory) {

        mInjectionInflationController = injectionInflationController;

        mCoordinator = coordinator;

        mPulseExpansionHandler = pulseExpansionHandler;
@@ -162,7 +160,7 @@ public class NotificationShadeWindowViewController { 
        mNotificationPanelViewController = notificationPanelViewController;

        mDepthController = depthController;

        mStatusBarViewFactory = statusBarViewFactory;

        mPowerManager = context.getSystemService(PowerManager.class);

        mPowerManager = mView.getContext().getSystemService(PowerManager.class);



        // This view is not part of the newly inflated expanded status bar.

        mBrightnessMirror = mView.findViewById(R.id.brightness_mirror);

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java

+5 −1
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ import com.android.systemui.statusbar.notification.stack.NotificationStackScroll 
import com.android.systemui.statusbar.policy.ConfigurationController;

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

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

import com.android.systemui.tuner.TunerService;

import com.android.systemui.util.InjectionInflationController;



import org.junit.Before;
@@ -188,6 +189,8 @@ public class NotificationPanelViewTest extends SysuiTestCase { 
    private NotificationPanelViewController mNotificationPanelViewController;

    private View.AccessibilityDelegate mAccessibiltyDelegate;



    private TunerService mTunerService;



    @Before

    public void setup() {

        MockitoAnnotations.initMocks(this);
@@ -240,7 +243,8 @@ public class NotificationPanelViewTest extends SysuiTestCase { 
                mMetricsLogger, mActivityManager, mZenModeController, mConfigurationController,

                mFlingAnimationUtilsBuilder, mStatusBarTouchableRegionManager,

                mConversationNotificationManager, mMediaHiearchyManager,

                mBiometricUnlockController, mStatusBarKeyguardViewManager);

                mBiometricUnlockController, mStatusBarKeyguardViewManager,

                mTunerService);

        mNotificationPanelViewController.initDependencies(mStatusBar, mGroupManager,

                mNotificationShelf, mNotificationAreaController, mScrimController);

        mNotificationPanelViewController.setHeadsUpManager(mHeadsUpManager);