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

Commit eec293a2 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[SB][RONs] Rename chip resource ID to ongoing_activity_chip_primary. 

Because we want to support multiple chips at the same time with RONs,
this proactively re-names the current single chip to be
ongoing_activity_chip_primary. This will let us add an
ongoing_activity_chip_secondary later.

Bug: 364653005
Flag: NONE resource only change
Test: Smoke test of existing ongoing activity chips
Test: atest CollapsedStatusBarFragmentTest
Change-Id: Id3273a03f5b0a1b65e4d25fa74f36ec65690147c
parent 5f1c1da0

packages/SystemUI/res/layout/ongoing_activity_chip.xml

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
     the chip. -->

<FrameLayout

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

    android:id="@+id/ongoing_activity_chip"

    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:layout_gravity="center_vertical|start"

packages/SystemUI/res/layout/status_bar.xml

+4 −1
Original line number Diff line number Diff line
@@ -99,7 +99,10 @@ 
                        android:gravity="center_vertical|start"

                    />



                    <include layout="@layout/ongoing_activity_chip" />

                    <include layout="@layout/ongoing_activity_chip"

                        android:id="@+id/ongoing_activity_chip_primary"/>



                    <!-- TODO(b/364653005): Add a second activity chip. -->



                    <com.android.systemui.statusbar.AlphaOptimizedFrameLayout

                        android:id="@+id/notification_icon_area"

packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipsViewModel.kt

+3 −3
Original line number Diff line number Diff line
@@ -151,13 +151,13 @@ constructor( 
        }



    /**

     * A flow modeling the chip that should be shown in the status bar after accounting for possibly

     * multiple ongoing activities and animation requirements.

     * A flow modeling the primary chip that should be shown in the status bar after accounting for

     * possibly multiple ongoing activities and animation requirements.

     *

     * [com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment] is responsible for

     * actually displaying the chip.

     */

    val chip: StateFlow<OngoingActivityChipModel> =

    val primaryChip: StateFlow<OngoingActivityChipModel> =

        internalChip

            .pairwise(initialValue = DEFAULT_INTERNAL_HIDDEN_MODEL)

            .map { (old, new) ->

packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java

+11 −11
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
    private MultiSourceMinAlphaController mEndSideAlphaController;

    private LinearLayout mEndSideContent;

    private View mClockView;

    private View mOngoingActivityChip;

    private View mPrimaryOngoingActivityChip;

    private View mNotificationIconAreaInner;

    // Visibilities come in from external system callers via disable flags, but we also sometimes

    // modify the visibilities internally. We need to store both so that we don't accidentally
@@ -354,7 +354,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
        mEndSideContent = mStatusBar.findViewById(R.id.status_bar_end_side_content);

        mEndSideAlphaController = new MultiSourceMinAlphaController(mEndSideContent);

        mClockView = mStatusBar.findViewById(R.id.clock);

        mOngoingActivityChip = mStatusBar.findViewById(R.id.ongoing_activity_chip);

        mPrimaryOngoingActivityChip = mStatusBar.findViewById(R.id.ongoing_activity_chip_primary);

        showEndSideContent(false);

        showClock(false);

        initOperatorName();
@@ -636,9 +636,9 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
        // icons so if the icons are disabled then the activity chip should be, too.)

        boolean showOngoingActivityChip = hasOngoingActivity && !disableNotifications;

        if (showOngoingActivityChip) {

            showOngoingActivityChip(animate);

            showPrimaryOngoingActivityChip(animate);

        } else {

            hideOngoingActivityChip(animate);

            hidePrimaryOngoingActivityChip(animate);

        }

    }
@@ -729,20 +729,20 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
        animateShow(mClockView, animate);

    }



    /** Hides the ongoing activity chip. */

    private void hideOngoingActivityChip(boolean animate) {

        animateHiddenState(mOngoingActivityChip, View.GONE, animate);

    /** Hides the primary ongoing activity chip. */

    private void hidePrimaryOngoingActivityChip(boolean animate) {

        animateHiddenState(mPrimaryOngoingActivityChip, View.GONE, animate);

    }



    /**

     * Displays the ongoing activity chip.

     * Displays the primary ongoing activity chip.

     *

     * If Flags.statusBarScreenSharingChips is disabled, this chip will only ever contain the

     * ongoing call information, If that flag is enabled, it will support different kinds of ongoing

     * activities. See b/332662551.

     */

    private void showOngoingActivityChip(boolean animate) {

        animateShow(mOngoingActivityChip, animate);

    private void showPrimaryOngoingActivityChip(boolean animate) {

        animateShow(mPrimaryOngoingActivityChip, animate);

    }



    /**
@@ -850,7 +850,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 


    private void initOngoingCallChip() {

        mOngoingCallController.addCallback(mOngoingCallListener);

        mOngoingCallController.setChipView(mOngoingActivityChip);

        mOngoingCallController.setChipView(mPrimaryOngoingActivityChip);

    }



    @Override

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/binder/CollapsedStatusBarViewBinder.kt

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ class CollapsedStatusBarViewBinderImpl @Inject constructor() : CollapsedStatusBa 
                }



                if (Flags.statusBarScreenSharingChips()) {

                    val chipView: View = view.requireViewById(R.id.ongoing_activity_chip)

                    val chipView: View = view.requireViewById(R.id.ongoing_activity_chip_primary)

                    val chipContext = chipView.context

                    val chipDefaultIconView: ImageView =

                        chipView.requireViewById(R.id.ongoing_activity_chip_icon)
@@ -106,7 +106,7 @@ class CollapsedStatusBarViewBinderImpl @Inject constructor() : CollapsedStatusBa 
                            R.id.ongoing_activity_chip_background

                        )

                    launch {

                        viewModel.ongoingActivityChip.collect { chipModel ->

                        viewModel.primaryOngoingActivityChip.collect { chipModel ->

                            when (chipModel) {

                                is OngoingActivityChipModel.Shown -> {

                                    // Data