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

Commit 4d5104df authored by Heemin Seog's avatar Heemin Seog Committed by Automerger Merge Worker
Browse files

Merge "Dismiss panel when requested to close system dialogs" into rvc-dev am: 8808b5a3 

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

Change-Id: Icf83ebdc3a5551503a97b9bb1198ede5df3127d9
parents 57c56e91 8808b5a3

packages/CarSystemUI/src/com/android/systemui/car/notification/BottomNotificationPanelViewMediator.java

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.car.notification;



import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.car.CarDeviceProvisionedController;

import com.android.systemui.car.navigationbar.CarNavigationBarController;

import com.android.systemui.car.window.OverlayPanelViewController;
@@ -37,6 +38,7 @@ public class BottomNotificationPanelViewMediator extends NotificationPanelViewMe 
            NotificationPanelViewController notificationPanelViewController,



            PowerManagerHelper powerManagerHelper,

            BroadcastDispatcher broadcastDispatcher,



            CarDeviceProvisionedController carDeviceProvisionedController,

            ConfigurationController configurationController
@@ -44,6 +46,7 @@ public class BottomNotificationPanelViewMediator extends NotificationPanelViewMe 
        super(carNavigationBarController,

                notificationPanelViewController,

                powerManagerHelper,

                broadcastDispatcher,

                carDeviceProvisionedController,

                configurationController);

        notificationPanelViewController.setOverlayDirection(

packages/CarSystemUI/src/com/android/systemui/car/notification/NotificationPanelViewMediator.java

+29 −0
Original line number Diff line number Diff line
@@ -17,10 +17,17 @@ 
package com.android.systemui.car.notification;



import android.car.hardware.power.CarPowerManager;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.res.Configuration;

import android.os.UserHandle;

import android.util.Log;



import androidx.annotation.CallSuper;



import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.car.CarDeviceProvisionedController;

import com.android.systemui.car.navigationbar.CarNavigationBarController;

import com.android.systemui.car.window.OverlayViewMediator;
@@ -37,18 +44,36 @@ import javax.inject.Singleton; 
public class NotificationPanelViewMediator implements OverlayViewMediator,

        ConfigurationController.ConfigurationListener {



    private static final boolean DEBUG = false;

    private static final String TAG = "NotificationPanelVM";



    private final CarNavigationBarController mCarNavigationBarController;

    private final NotificationPanelViewController mNotificationPanelViewController;

    private final PowerManagerHelper mPowerManagerHelper;

    private final BroadcastDispatcher mBroadcastDispatcher;

    private final CarDeviceProvisionedController mCarDeviceProvisionedController;

    private final ConfigurationController mConfigurationController;



    private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            if (DEBUG) Log.v(TAG, "onReceive: " + intent);

            String action = intent.getAction();

            if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(action)) {

                if (mNotificationPanelViewController.isPanelExpanded()) {

                    mNotificationPanelViewController.toggle();

                }

            }

        }

    };



    @Inject

    public NotificationPanelViewMediator(

            CarNavigationBarController carNavigationBarController,

            NotificationPanelViewController notificationPanelViewController,



            PowerManagerHelper powerManagerHelper,

            BroadcastDispatcher broadcastDispatcher,



            CarDeviceProvisionedController carDeviceProvisionedController,

            ConfigurationController configurationController
@@ -56,6 +81,7 @@ public class NotificationPanelViewMediator implements OverlayViewMediator, 
        mCarNavigationBarController = carNavigationBarController;

        mNotificationPanelViewController = notificationPanelViewController;

        mPowerManagerHelper = powerManagerHelper;

        mBroadcastDispatcher = broadcastDispatcher;

        mCarDeviceProvisionedController = carDeviceProvisionedController;

        mConfigurationController = configurationController;

    }
@@ -84,6 +110,9 @@ public class NotificationPanelViewMediator implements OverlayViewMediator, 
                        return mNotificationPanelViewController.isPanelExpanded();

                    }

                });



        mBroadcastDispatcher.registerReceiver(mBroadcastReceiver,

                new IntentFilter(Intent.ACTION_CLOSE_SYSTEM_DIALOGS), null, UserHandle.ALL);

    }



    @Override

packages/CarSystemUI/src/com/android/systemui/car/notification/TopNotificationPanelViewMediator.java

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.car.notification;



import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.car.CarDeviceProvisionedController;

import com.android.systemui.car.navigationbar.CarNavigationBarController;

import com.android.systemui.car.window.OverlayPanelViewController;
@@ -37,6 +38,7 @@ public class TopNotificationPanelViewMediator extends NotificationPanelViewMedia 
            NotificationPanelViewController notificationPanelViewController,



            PowerManagerHelper powerManagerHelper,

            BroadcastDispatcher broadcastDispatcher,



            CarDeviceProvisionedController carDeviceProvisionedController,

            ConfigurationController configurationController
@@ -44,6 +46,7 @@ public class TopNotificationPanelViewMediator extends NotificationPanelViewMedia 
        super(carNavigationBarController,

                notificationPanelViewController,

                powerManagerHelper,

                broadcastDispatcher,

                carDeviceProvisionedController,

                configurationController);

        notificationPanelViewController.setOverlayDirection(