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

Commit f3003485 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I33e247b6,I27f8f209 into udc-qpr-dev am: b89d4210 

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



Change-Id: I3836da5ecc0e6a09a288db7402c86eae917fb3e4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2f92110f b89d4210

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
+684 −0

File added.

Preview size limit exceeded, changes collapsed.

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

0 → 100644
+33 −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

import kotlinx.coroutines.DisposableHandle



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

object NotificationIconContainerViewBinder {

    fun bind(

        view: NotificationIconContainer,

        viewModel: NotificationIconContainerViewModel,

    ): DisposableHandle {

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

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewmodel/NotificationIconContainerAlwaysOnDisplayViewModel.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



import javax.inject.Inject



/** View-model for the row of notification icons displayed on the always-on display. */

class NotificationIconContainerAlwaysOnDisplayViewModel @Inject constructor() :

    NotificationIconContainerViewModel

packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewmodel/NotificationIconContainerShelfViewModel.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



import javax.inject.Inject



/** View-model for the overflow row of notification icons displayed in the notification shade. */

class NotificationIconContainerShelfViewModel @Inject constructor() :

    NotificationIconContainerViewModel