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

Commit 0b7c3abf authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

Handle manage/history button in new footer stack. 

Note: I had to move StatusBarNotificationPresenterModule out of
CentralSurfacesDependenciesModule (and into CentralSurfacesModule and
CentralSurfacesGoogleModule, respectively). Otherwise building arc was
failing due to duplicate bindings (since NotificationPresenter is also
bound under ArcNotificationsModule, which includes
CentralSurfacesDependenciesModule).

Also avoid using dagger/ packages, as that's no longer recommended.

Bug: 297176322
Test: FooterViewTest, FooterViewModelTest,
NotificationSettingsRepositoryTest, NotificationListViewModelTest
Flag: ACONFIG com.android.systemui.notifications_footer_view_refactor DEVELOPMENT

Change-Id: I70bd419be083257690f466660543c7973bd376fa
parent a59c3333

packages/SystemUI/customization/src/com/android/systemui/shared/notifications/data/repository/NotificationSettingsRepository.kt

+8 −0
Original line number Diff line number Diff line
@@ -20,8 +20,10 @@ import android.provider.Settings 
import com.android.systemui.shared.settings.data.repository.SecureSettingsRepository

import kotlinx.coroutines.CoroutineDispatcher

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.SharingStarted

import kotlinx.coroutines.flow.StateFlow

import kotlinx.coroutines.flow.distinctUntilChanged

import kotlinx.coroutines.flow.map

import kotlinx.coroutines.flow.stateIn

import kotlinx.coroutines.withContext
@@ -32,6 +34,12 @@ class NotificationSettingsRepository( 
    private val backgroundDispatcher: CoroutineDispatcher,

    private val secureSettingsRepository: SecureSettingsRepository,

) {

    val isNotificationHistoryEnabled: Flow<Boolean> =

        secureSettingsRepository

            .intSetting(name = Settings.Secure.NOTIFICATION_HISTORY_ENABLED)

            .map { it == 1 }

            .distinctUntilChanged()



    /** The current state of the notification setting. */

    val isShowNotificationsOnLockScreenEnabled: StateFlow<Boolean> =

        secureSettingsRepository

packages/SystemUI/customization/src/com/android/systemui/shared/notifications/domain/interactor/NotificationSettingsInteractor.kt

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ import kotlinx.coroutines.flow.StateFlow 
class NotificationSettingsInteractor(

    private val repository: NotificationSettingsRepository,

) {

    val isNotificationHistoryEnabled = repository.isNotificationHistoryEnabled



    /** Should notifications be visible on the lockscreen? */

    val isShowNotificationsOnLockScreenEnabled: StateFlow<Boolean> =

        repository.isShowNotificationsOnLockScreenEnabled

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

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ import com.android.systemui.recents.RecentsImplementation; 
import com.android.systemui.rotationlock.RotationLockModule;

import com.android.systemui.scene.SceneContainerFrameworkModule;

import com.android.systemui.screenshot.ReferenceScreenshotModule;

import com.android.systemui.settings.dagger.MultiUserUtilsModule;

import com.android.systemui.settings.MultiUserUtilsModule;

import com.android.systemui.shade.NotificationShadeWindowControllerImpl;

import com.android.systemui.shade.ShadeModule;

import com.android.systemui.statusbar.CommandQueue;

packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ import com.android.systemui.media.taptotransfer.MediaTttCommandLineHelper 
import com.android.systemui.media.taptotransfer.receiver.MediaTttChipControllerReceiver

import com.android.systemui.media.taptotransfer.sender.MediaTttSenderCoordinator

import com.android.systemui.mediaprojection.taskswitcher.MediaProjectionTaskSwitcherCoreStartable

import com.android.systemui.settings.dagger.MultiUserUtilsModule

import com.android.systemui.settings.MultiUserUtilsModule

import com.android.systemui.shortcut.ShortcutKeyDispatcher

import com.android.systemui.statusbar.ImmersiveModeConfirmation

import com.android.systemui.statusbar.gesture.GesturePointerEventListener

packages/SystemUI/src/com/android/systemui/settings/dagger/MultiUserUtilsModule.java→packages/SystemUI/src/com/android/systemui/settings/MultiUserUtilsModule.java

+1 −9
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.systemui.settings.dagger;

package com.android.systemui.settings;



import android.app.ActivityManager;

import android.app.IActivityManager;
@@ -29,14 +29,6 @@ import com.android.systemui.dagger.qualifiers.Application; 
import com.android.systemui.dagger.qualifiers.Background;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.flags.FeatureFlagsClassic;

import com.android.systemui.settings.DisplayTracker;

import com.android.systemui.settings.DisplayTrackerImpl;

import com.android.systemui.settings.UserContentResolverProvider;

import com.android.systemui.settings.UserContextProvider;

import com.android.systemui.settings.UserFileManager;

import com.android.systemui.settings.UserFileManagerImpl;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.settings.UserTrackerImpl;



import dagger.Binds;

import dagger.Module;