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

Commit 74787ef1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I28706e2e,I0af8480c into tm-qpr-dev 

* changes:
  [Chipbar] Move the Media TTT callback listener to a media-specific coordinator class.
  [Chipbar] Rename MediaTttChipControllerSender to ChipbarCoordinator, since it has all the chipbar logic.
parents 76695a5e 9a35f7ec

packages/SystemUI/ktfmt_includes.txt

+3 −3
Original line number Diff line number Diff line
@@ -246,8 +246,6 @@ 
-packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttReceiverLogger.kt

-packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/ReceiverChipRippleView.kt

-packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/ChipStateSender.kt

-packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSender.kt

-packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipRootView.kt

-packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderLogger.kt

-packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderUiEventLogger.kt

-packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanel.kt
@@ -528,6 +526,8 @@ 
-packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowStateController.kt

-packages/SystemUI/src/com/android/systemui/temporarydisplay/TemporaryViewInfo.kt

-packages/SystemUI/src/com/android/systemui/temporarydisplay/TemporaryViewDisplayController.kt

-packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarCoordinator.kt

-packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarRootView.kt

-packages/SystemUI/src/com/android/systemui/toast/ToastDefaultAnimation.kt

-packages/SystemUI/src/com/android/systemui/toast/ToastLogger.kt

-packages/SystemUI/src/com/android/systemui/tv/TVSystemUICoreStartableModule.kt
@@ -678,7 +678,6 @@ 
-packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/MediaTttCommandLineHelperTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/common/MediaTttLoggerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiverTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSenderTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderUiEventLoggerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/navigationbar/gestural/FloatingRotationButtonPositionCalculatorTest.kt

-packages/SystemUI/tests/src/com/android/systemui/privacy/AppOpsPrivacyItemMonitorTest.kt
@@ -833,6 +832,7 @@ 
-packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/WalletControllerImplTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/window/StatusBarWindowStateControllerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/temporarydisplay/TemporaryViewDisplayControllerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/temporarydisplay/chipbar/ChipbarCoordinatorTest.kt

-packages/SystemUI/tests/src/com/android/systemui/unfold/FoldStateLoggingProviderTest.kt

-packages/SystemUI/tests/src/com/android/systemui/unfold/UnfoldLatencyTrackerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/unfold/UnfoldTransitionWallpaperControllerTest.kt

packages/SystemUI/res/layout/media_ttt_chip.xml→packages/SystemUI/res/layout/chipbar.xml

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
<!-- Wrap in a frame layout so that we can update the margins on the inner layout. (Since this view

     is the root view of a window, we cannot change the root view's margins.) -->

<!-- Alphas start as 0 because the view will be animated in. -->

<com.android.systemui.media.taptotransfer.sender.MediaTttChipRootView

<com.android.systemui.temporarydisplay.chipbar.ChipbarRootView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:id="@+id/media_ttt_sender_chip"
@@ -97,4 +97,4 @@ 
            />



    </LinearLayout>

</com.android.systemui.media.taptotransfer.sender.MediaTttChipRootView>
 
</com.android.systemui.temporarydisplay.chipbar.ChipbarRootView>

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

+14 −9
Original line number Diff line number Diff line
@@ -34,13 +34,14 @@ import com.android.systemui.log.SessionTracker 
import com.android.systemui.media.RingtonePlayer

import com.android.systemui.media.taptotransfer.MediaTttCommandLineHelper

import com.android.systemui.media.taptotransfer.receiver.MediaTttChipControllerReceiver

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

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

import com.android.systemui.power.PowerUI

import com.android.systemui.recents.Recents

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

import com.android.systemui.shortcut.ShortcutKeyDispatcher

import com.android.systemui.statusbar.notification.InstantAppNotifier

import com.android.systemui.statusbar.phone.KeyguardLiftController

import com.android.systemui.temporarydisplay.chipbar.ChipbarCoordinator

import com.android.systemui.theme.ThemeOverlayController

import com.android.systemui.toast.ToastUI

import com.android.systemui.usb.StorageNotification
@@ -217,6 +218,12 @@ abstract class SystemUICoreStartableModule { 
    @ClassKey(KeyguardLiftController::class)

    abstract fun bindKeyguardLiftController(sysui: KeyguardLiftController): CoreStartable



    /** Inject into MediaTttSenderCoordinator. */

    @Binds

    @IntoMap

    @ClassKey(MediaTttSenderCoordinator::class)

    abstract fun bindMediaTttSenderCoordinator(sysui: MediaTttSenderCoordinator): CoreStartable



    /** Inject into MediaTttChipControllerReceiver. */

    @Binds

    @IntoMap
@@ -225,17 +232,15 @@ abstract class SystemUICoreStartableModule { 
            sysui: MediaTttChipControllerReceiver

    ): CoreStartable



    /** Inject into MediaTttChipControllerSender. */

    @Binds

    @IntoMap

    @ClassKey(MediaTttChipControllerSender::class)

    abstract fun bindMediaTttChipControllerSender(

            sysui: MediaTttChipControllerSender

    ): CoreStartable



    /** Inject into MediaTttCommandLineHelper. */

    @Binds

    @IntoMap

    @ClassKey(MediaTttCommandLineHelper::class)

    abstract fun bindMediaTttCommandLineHelper(sysui: MediaTttCommandLineHelper): CoreStartable



    /** Inject into ChipbarCoordinator. */

    @Binds

    @IntoMap

    @ClassKey(ChipbarCoordinator::class)

    abstract fun bindChipbarController(sysui: ChipbarCoordinator): CoreStartable

}

packages/SystemUI/src/com/android/systemui/media/dagger/MediaModule.java

+0 −26
Original line number Diff line number Diff line
@@ -31,9 +31,7 @@ import com.android.systemui.media.nearby.NearbyMediaDevicesManager; 
import com.android.systemui.media.taptotransfer.MediaTttCommandLineHelper;

import com.android.systemui.media.taptotransfer.MediaTttFlags;

import com.android.systemui.media.taptotransfer.common.MediaTttLogger;

import com.android.systemui.media.taptotransfer.receiver.MediaTttChipControllerReceiver;

import com.android.systemui.media.taptotransfer.receiver.MediaTttReceiverLogger;

import com.android.systemui.media.taptotransfer.sender.MediaTttChipControllerSender;

import com.android.systemui.media.taptotransfer.sender.MediaTttSenderLogger;



import java.util.Optional;
@@ -94,30 +92,6 @@ public interface MediaModule { 
        return new MediaHost(stateHolder, hierarchyManager, dataManager, statesManager);

    }



    /** */

    @Provides

    @SysUISingleton

    static Optional<MediaTttChipControllerSender> providesMediaTttChipControllerSender(

            MediaTttFlags mediaTttFlags,

            Lazy<MediaTttChipControllerSender> controllerSenderLazy) {

        if (!mediaTttFlags.isMediaTttEnabled()) {

            return Optional.empty();

        }

        return Optional.of(controllerSenderLazy.get());

    }



    /** */

    @Provides

    @SysUISingleton

    static Optional<MediaTttChipControllerReceiver> providesMediaTttChipControllerReceiver(

            MediaTttFlags mediaTttFlags,

            Lazy<MediaTttChipControllerReceiver> controllerReceiverLazy) {

        if (!mediaTttFlags.isMediaTttEnabled()) {

            return Optional.empty();

        }

        return Optional.of(controllerReceiverLazy.get());

    }



    @Provides

    @SysUISingleton

    @MediaTttSenderLogger

packages/SystemUI/src/com/android/systemui/media/taptotransfer/README.md

+2 −0
Original line number Diff line number Diff line
@@ -41,3 +41,5 @@ in the `receiver` package, and code that's shared between them is in the `common 
## Testing

If you want to test out the tap-to-transfer chip without using the `@SystemApi`s, you can use adb

commands instead. Refer to `MediaTttCommandLineHelper` for information about adb commands.



TODO(b/245610654): Update this page once the chipbar migration is complete.