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

Commit 2c00b0da authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge changes I69cadfeb,I79c72e38,I58546516 into udc-dev am: 3ee8debb am: db16a9d8 

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



Change-Id: If895fbce37aeec409e14d3ae7bc3f3f5f827ad80
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 67de7276 db16a9d8

packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ import com.android.systemui.screenshot.dagger.ScreenshotModule; 
import com.android.systemui.security.data.repository.SecurityRepositoryModule;

import com.android.systemui.settings.DisplayTracker;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.shade.ShadeModule;

import com.android.systemui.shade.transition.LargeScreenShadeInterpolator;

import com.android.systemui.shade.transition.LargeScreenShadeInterpolatorImpl;

import com.android.systemui.smartspace.dagger.SmartspaceModule;
@@ -177,6 +178,7 @@ import javax.inject.Named; 
            SecurityRepositoryModule.class,

            ScreenRecordModule.class,

            SettingsUtilModule.class,

            ShadeModule.class,

            SmartRepliesInflationModule.class,

            SmartspaceModule.class,

            StatusBarPipelineModule.class,

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+0 −3
Original line number Diff line number Diff line
@@ -1021,9 +1021,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
                userAvatarContainer,

                keyguardUserSwitcherView);



        NotificationStackScrollLayout stackScrollLayout = mView.findViewById(

                R.id.notification_stack_scroller);

        mNotificationStackScrollLayoutController.attach(stackScrollLayout);

        mNotificationStackScrollLayoutController.setOnHeightChangedListener(

                new NsslHeightChangedListener());

        mNotificationStackScrollLayoutController.setOnEmptySpaceClickListener(

packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowView.java

+0 −4
Original line number Diff line number Diff line
@@ -84,10 +84,6 @@ public class NotificationShadeWindowView extends FrameLayout { 
        setMotionEventSplittingEnabled(false);

    }



    public NotificationPanelView getNotificationPanelView() {

        return findViewById(R.id.notification_panel);

    }



    @Override

    public WindowInsets onApplyWindowInsets(WindowInsets windowInsets) {

        final Insets insets = windowInsets.getInsetsIgnoringVisibility(systemBars());

packages/SystemUI/src/com/android/systemui/shade/ShadeModule.kt

0 → 100644
+63 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.shade



import android.view.LayoutInflater

import com.android.systemui.R

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout

import dagger.Module

import dagger.Provides



/** Module for classes related to the notification shade. */

@Module

abstract class ShadeModule {

    companion object {

        @Provides

        @SysUISingleton

        // TODO(b/277762009): Do something similar to

        //  {@link StatusBarWindowModule.InternalWindowView} so that only

        //  {@link NotificationShadeWindowViewController} can inject this view.

        fun providesNotificationShadeWindowView(

            layoutInflater: LayoutInflater,

        ): NotificationShadeWindowView {

            return layoutInflater.inflate(R.layout.super_notification_shade, /* root= */ null)

                as NotificationShadeWindowView?

                ?: throw IllegalStateException(

                    "R.layout.super_notification_shade could not be properly inflated"

                )

        }



        // TODO(b/277762009): Only allow this view's controller to inject the view. See above.

        @Provides

        @SysUISingleton

        fun providesNotificationStackScrollLayout(

            notificationShadeWindowView: NotificationShadeWindowView,

        ): NotificationStackScrollLayout {

            return notificationShadeWindowView.findViewById(R.id.notification_stack_scroller)

        }



        // TODO(b/277762009): Only allow this view's controller to inject the view. See above.

        @Provides

        @SysUISingleton

        fun providesNotificationPanelView(

            notificationShadeWindowView: NotificationShadeWindowView,

        ): NotificationPanelView {

            return notificationShadeWindowView.findViewById(R.id.notification_panel)

        }

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java

+4 −2
Original line number Diff line number Diff line
@@ -627,6 +627,7 @@ public class NotificationStackScrollLayoutController { 


    @Inject

    public NotificationStackScrollLayoutController(

            NotificationStackScrollLayout view,

            @Named(ALLOW_NOTIFICATION_LONG_PRESS_NAME) boolean allowLongPress,

            NotificationGutsManager notificationGutsManager,

            NotificationVisibilityProvider visibilityProvider,
@@ -668,6 +669,7 @@ public class NotificationStackScrollLayoutController { 
            NotificationTargetsHelper notificationTargetsHelper,

            SecureSettings secureSettings,

            NotificationDismissibilityProvider dismissibilityProvider) {

        mView = view;

        mStackStateLogger = stackLogger;

        mLogger = logger;

        mAllowLongPress = allowLongPress;
@@ -711,10 +713,10 @@ public class NotificationStackScrollLayoutController { 
        mSecureSettings = secureSettings;

        mDismissibilityProvider = dismissibilityProvider;

        updateResources();

        setUpView();

    }



    public void attach(NotificationStackScrollLayout view) {

        mView = view;

    private void setUpView() {

        mView.setLogger(mStackStateLogger);

        mView.setController(this);

        mView.setLogger(mLogger);