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

Commit d55384fd authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge changes from topic "caitlinshk-cs-transient" into main 

* changes:
  [CS] 2/ Remove ongoing call flags; make controller a CoreStartable.
  [CS] 1/ Define transientShown in status bar repo not CentralSurfaces.
parents 7bc7f053 ee82a471

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

+2 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ import com.android.systemui.statusbar.CommandQueue; 
import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.connectivity.ConnectivityModule;

import com.android.systemui.statusbar.dagger.StatusBarModule;

import com.android.systemui.statusbar.disableflags.dagger.DisableFlagsModule;

import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler;

import com.android.systemui.statusbar.notification.NotifPipelineFlags;
@@ -198,6 +199,7 @@ import javax.inject.Named; 
            SettingsUtilModule.class,

            SmartRepliesInflationModule.class,

            SmartspaceModule.class,

            StatusBarModule.class,

            StatusBarPipelineModule.class,

            StatusBarPolicyModule.class,

            StatusBarWindowModule.class,

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −10
Original line number Diff line number Diff line
@@ -412,16 +412,6 @@ object Flags { 
    val NEW_SHADE_CARRIER_GROUP_MOBILE_ICONS =

        releasedFlag("new_shade_carrier_group_mobile_icons")



    // 700 - dialer/calls

    // TODO(b/254512734): Tracking Bug

    val ONGOING_CALL_STATUS_BAR_CHIP = releasedFlag("ongoing_call_status_bar_chip")



    // TODO(b/254512681): Tracking Bug

    val ONGOING_CALL_IN_IMMERSIVE = releasedFlag("ongoing_call_in_immersive")



    // TODO(b/254512753): Tracking Bug

    val ONGOING_CALL_IN_IMMERSIVE_CHIP_TAP = releasedFlag("ongoing_call_in_immersive_chip_tap")



    // 800 - general visual/theme

    @JvmField val MONET = resourceBooleanFlag(R.bool.flag_monet, "monet")

packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java

+1 −8
Original line number Diff line number Diff line
@@ -372,18 +372,11 @@ public class CommandQueue extends IStatusBar.Stub implements 
                @Behavior int behavior, @InsetsType int requestedVisibleTypes,

                String packageName, LetterboxDetails[] letterboxDetails) { }



        /**

         * @see IStatusBar#showTransient(int, int, boolean).

         */

        default void showTransient(int displayId, @InsetsType int types) { }



        /**

         * @see IStatusBar#showTransient(int, int, boolean).

         */

        default void showTransient(int displayId, @InsetsType int types,

                boolean isGestureOnSystemBar) {

            showTransient(displayId, types);

        }

                boolean isGestureOnSystemBar) {}



        /**

         * @see IStatusBar#abortTransient(int, int).

packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java

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


package com.android.systemui.statusbar.dagger;



import android.app.IActivityManager;

import android.app.WallpaperManager;

import android.content.Context;

import android.hardware.display.DisplayManager;
@@ -38,7 +37,6 @@ import com.android.systemui.dump.DumpManager; 
import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.media.controls.pipeline.MediaDataManager;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.power.domain.interactor.PowerInteractor;

import com.android.systemui.settings.DisplayTracker;
@@ -57,12 +55,10 @@ import com.android.systemui.statusbar.SmartReplyController; 
import com.android.systemui.statusbar.StatusBarStateControllerImpl;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.commandline.CommandRegistry;

import com.android.systemui.statusbar.gesture.SwipeStatusBarAwayGestureHandler;

import com.android.systemui.statusbar.notification.NotifPipelineFlags;

import com.android.systemui.statusbar.notification.RemoteInputControllerLogger;

import com.android.systemui.statusbar.notification.collection.NotifCollection;

import com.android.systemui.statusbar.notification.collection.NotifPipeline;

import com.android.systemui.statusbar.notification.collection.notifcollection.CommonNotifCollection;

import com.android.systemui.statusbar.notification.collection.render.NotificationVisibilityProvider;

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

import com.android.systemui.statusbar.phone.KeyguardBypassController;
@@ -73,23 +69,15 @@ import com.android.systemui.statusbar.phone.StatusBarIconControllerImpl; 
import com.android.systemui.statusbar.phone.StatusBarIconList;

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

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

import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController;

import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallFlags;

import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallLogger;

import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.systemui.statusbar.policy.RemoteInputUriController;

import com.android.systemui.statusbar.window.StatusBarWindowController;

import com.android.systemui.util.concurrency.DelayableExecutor;

import com.android.systemui.util.time.SystemClock;



import dagger.Binds;

import dagger.Lazy;

import dagger.Module;

import dagger.Provides;



import java.util.Optional;

import java.util.concurrent.Executor;



/**

 * This module provides instances needed to construct {@link CentralSurfacesImpl}. These are moved to

 * this separate from {@link CentralSurfacesModule} module so that components that wish to build
@@ -229,51 +217,6 @@ public interface CentralSurfacesDependenciesModule { 
                        com.android.internal.R.array.config_statusBarIcons));

    }



    /**

     */

    @Provides

    @SysUISingleton

    static OngoingCallController provideOngoingCallController(

            Context context,

            CommonNotifCollection notifCollection,

            SystemClock systemClock,

            ActivityStarter activityStarter,

            @Main Executor mainExecutor,

            IActivityManager iActivityManager,

            OngoingCallLogger logger,

            DumpManager dumpManager,

            StatusBarWindowController statusBarWindowController,

            SwipeStatusBarAwayGestureHandler swipeStatusBarAwayGestureHandler,

            StatusBarStateController statusBarStateController,

            OngoingCallFlags ongoingCallFlags) {



        boolean ongoingCallInImmersiveEnabled = ongoingCallFlags.isInImmersiveEnabled();

        Optional<StatusBarWindowController> windowController =

                ongoingCallInImmersiveEnabled

                        ? Optional.of(statusBarWindowController)

                        : Optional.empty();

        Optional<SwipeStatusBarAwayGestureHandler> gestureHandler =

                ongoingCallInImmersiveEnabled

                        ? Optional.of(swipeStatusBarAwayGestureHandler)

                        : Optional.empty();

        OngoingCallController ongoingCallController =

                new OngoingCallController(

                        context,

                        notifCollection,

                        ongoingCallFlags,

                        systemClock,

                        activityStarter,

                        mainExecutor,

                        iActivityManager,

                        logger,

                        dumpManager,

                        windowController,

                        gestureHandler,

                        statusBarStateController);

        ongoingCallController.init();

        return ongoingCallController;

    }



    /**

     * {@link NotificationPanelViewController} implements two interfaces:

     *  - {@link com.android.systemui.shade.ShadeViewController}, which can be used by any class

packages/SystemUI/src/com/android/systemui/statusbar/dagger/StatusBarModule.kt

0 → 100644
+52 −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.dagger



import com.android.systemui.CoreStartable

import com.android.systemui.statusbar.data.repository.StatusBarModeRepository

import com.android.systemui.statusbar.data.repository.StatusBarModeRepositoryImpl

import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController

import dagger.Binds

import dagger.Module

import dagger.multibindings.ClassKey

import dagger.multibindings.IntoMap



/**

 * A module for **only** classes related to the status bar **UI element**. This module specifically

 * should **not** include:

 * - Classes in the `statusbar` package that are unrelated to the status bar UI.

 * - Status bar classes that are already provided by other modules

 *   ([com.android.systemui.statusbar.pipeline.dagger.StatusBarPipelineModule],

 *   [com.android.systemui.statusbar.policy.dagger.StatusBarPolicyModule], etc.).

 */

@Module

abstract class StatusBarModule {

    @Binds

    abstract fun bindStatusBarModeRepository(

        impl: StatusBarModeRepositoryImpl

    ): StatusBarModeRepository



    @Binds

    @IntoMap

    @ClassKey(StatusBarModeRepositoryImpl::class)

    abstract fun bindStatusBarModeRepositoryStart(impl: StatusBarModeRepositoryImpl): CoreStartable



    @Binds

    @IntoMap

    @ClassKey(OngoingCallController::class)

    abstract fun bindOngoingCallController(impl: OngoingCallController): CoreStartable

}