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

Commit fbe4d08e authored by Steve Elliott's avatar Steve Elliott
Browse files

Introduce NotificationIconAreaController interface 

Fork implementation and dispatch based on
NOTIFICATION_ICON_CONTAINER_REFACTOR flag.

Bug: 290787599
Test: make
Change-Id: I27f8f2093c856b7e94423bfb0f70c4c34dfa7918
parent 59e9f7fe

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

+2 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ import com.android.systemui.statusbar.notification.row.dagger.NotificationRowCom 
import com.android.systemui.statusbar.notification.row.dagger.NotificationShelfComponent;

import com.android.systemui.statusbar.phone.CentralSurfaces;

import com.android.systemui.statusbar.phone.LetterboxModule;

import com.android.systemui.statusbar.phone.NotificationIconAreaControllerModule;

import com.android.systemui.statusbar.phone.dagger.CentralSurfacesComponent;

import com.android.systemui.statusbar.pipeline.dagger.StatusBarPipelineModule;

import com.android.systemui.statusbar.policy.HeadsUpManager;
@@ -184,6 +185,7 @@ import javax.inject.Named; 
            MediaProjectionModule.class,

            MediaProjectionTaskSwitcherModule.class,

            MotionToolModule.class,

            NotificationIconAreaControllerModule.class,

            PeopleHubModule.class,

            PeopleModule.class,

            PluginModule.class,

packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconAreaControllerViewBinderWrapperImpl.kt

0 → 100644
+673 −0

File added.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerViewBinder.kt

0 → 100644
+32 −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.statusbar.notification.icon.ui.viewbinder



import androidx.lifecycle.Lifecycle

import androidx.lifecycle.repeatOnLifecycle

import com.android.systemui.lifecycle.repeatWhenAttached

import com.android.systemui.statusbar.notification.icon.ui.viewmodel.NotificationIconContainerViewModel

import com.android.systemui.statusbar.phone.NotificationIconContainer



/** Binds a [NotificationIconContainer] to its [view model][NotificationIconContainerViewModel]. */

object NotificationIconContainerViewBinder {

    fun bind(

        view: NotificationIconContainer,

        viewModel: NotificationIconContainerViewModel,

    ) {

        view.repeatWhenAttached { repeatOnLifecycle(Lifecycle.State.CREATED) {} }

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewmodel/NotificationIconContainerViewModel.kt

0 → 100644
+22 −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.statusbar.notification.icon.ui.viewmodel



/**

 * View-model for the row of notification icons displayed in the NotificationShelf, StatusBar, and

 * AOD.

 */

interface NotificationIconContainerViewModel

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

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import static com.android.systemui.statusbar.notification.stack.NotificationStac 
import static com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout.ROWS_GENTLE;

import static com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout.ROWS_HIGH_PRIORITY;

import static com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout.SelectedRows;

import static com.android.systemui.statusbar.phone.NotificationIconAreaController.HIGH_PRIORITY;

import static com.android.systemui.util.kotlin.JavaAdapterKt.collectFlow;



import android.content.res.Configuration;
@@ -150,6 +149,7 @@ import javax.inject.Named; 
public class NotificationStackScrollLayoutController {

    private static final String TAG = "StackScrollerController";

    private static final boolean DEBUG = Compile.IS_DEBUG && Log.isLoggable(TAG, Log.DEBUG);

    private static final String HIGH_PRIORITY = "high_priority";



    private final boolean mAllowLongPress;

    private final NotificationGutsManager mNotificationGutsManager;