[SB][Screen Chips] Hook up new chip flow to CollapsedStatusBarFragment. (426eecd7) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/ongoing_activity_chip.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@

		<ImageView
		android:src="@*android:drawable/ic_phone"
		android:id="@+id/ongoing_activity_chip_icon"
		android:layout_width="@dimen/ongoing_activity_chip_icon_size"
		android:layout_height="@dimen/ongoing_activity_chip_icon_size"
		android:tint="?android:attr/colorPrimary"

packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/binder/ChipChronometerBinder.kt

0 → 100644

+33 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 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.chips.ui.binder

		import com.android.systemui.statusbar.chips.ui.view.ChipChronometer

		object ChipChronometerBinder {
		/**
		* Updates the given [view] chronometer with a new start time and starts it.
		*
		* @param startTimeMs the time this event started, relative to
		* [com.android.systemui.util.time.SystemClock.elapsedRealtime]. See
		* [android.widget.Chronometer.setBase].
		*/
		fun bind(startTimeMs: Long, view: ChipChronometer) {
		view.base = startTimeMs
		view.start()
		}
		}

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

+78 −39

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ import com.android.app.animation.Interpolators;
		import com.android.app.animation.InterpolatorsAndroidX;
		import com.android.keyguard.KeyguardUpdateMonitor;
		import com.android.systemui.Dumpable;
		import com.android.systemui.Flags;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.demomode.DemoMode;
		import com.android.systemui.demomode.DemoModeController;
		@@ -51,7 +52,6 @@ import com.android.systemui.statusbar.CommandQueue;
		import com.android.systemui.statusbar.OperatorNameView;
		import com.android.systemui.statusbar.OperatorNameViewController;
		import com.android.systemui.statusbar.StatusBarState;
		import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipsViewModel;
		import com.android.systemui.statusbar.disableflags.DisableFlagsLogger.DisableState;
		import com.android.systemui.statusbar.events.SystemStatusAnimationCallback;
		import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler;
		@@ -135,8 +135,6 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
		private final CollapsedStatusBarFragmentLogger mCollapsedStatusBarFragmentLogger;
		private final OperatorNameViewController.Factory mOperatorNameViewControllerFactory;
		private final OngoingCallController mOngoingCallController;
		// TODO(b/332662551): Use this view model to show the ongoing activity chips.
		private final OngoingActivityChipsViewModel mOngoingActivityChipsViewModel;
		private final SystemStatusAnimationScheduler mAnimationScheduler;
		private final StatusBarLocationPublisher mLocationPublisher;
		private final NotificationIconAreaController mNotificationIconAreaController;
		@@ -206,6 +204,11 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
		*/
		private boolean mTransitionFromLockscreenToDreamStarted = false;

		/**
		* True if there's an active ongoing activity that should be showing a chip and false otherwise.
		*/
		private boolean mHasOngoingActivity;

		/**
		* Listener that updates {@link #mWaitingForWindowStateChangeAfterCameraLaunch} when it receives
		* a new status bar window state.
		@@ -216,11 +219,12 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
		};
		private DisposableHandle mNicBindingDisposable;

		private boolean mAnimationsEnabled = true;

		@Inject
		public CollapsedStatusBarFragment(
		StatusBarFragmentComponent.Factory statusBarFragmentComponentFactory,
		OngoingCallController ongoingCallController,
		OngoingActivityChipsViewModel ongoingActivityChipsViewModel,
		SystemStatusAnimationScheduler animationScheduler,
		StatusBarLocationPublisher locationPublisher,
		NotificationIconAreaController notificationIconAreaController,
		@@ -246,7 +250,6 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
		DemoModeController demoModeController) {
		mStatusBarFragmentComponentFactory = statusBarFragmentComponentFactory;
		mOngoingCallController = ongoingCallController;
		mOngoingActivityChipsViewModel = ongoingActivityChipsViewModel;
		mAnimationScheduler = animationScheduler;
		mLocationPublisher = locationPublisher;
		mNotificationIconAreaController = notificationIconAreaController;
		@@ -401,6 +404,17 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
		return mBlockedIcons;
		}


		@VisibleForTesting
		void enableAnimationsForTesting() {
		mAnimationsEnabled = true;
		}

		@VisibleForTesting
		void disableAnimationsForTesting() {
		mAnimationsEnabled = false;
		}

		@Override
		public void onSaveInstanceState(Bundle outState) {
		super.onSaveInstanceState(outState);
		@@ -476,7 +490,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
		notificationIconArea.addView(mNotificationIconAreaInner);
		}

		updateNotificationIconAreaAndCallChip(/* animate= */ false);
		updateNotificationIconAreaAndOngoingActivityChip(/* animate= */ false);
		Trace.endSection();
		}

		@@ -502,6 +516,12 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
		public void onTransitionFromLockscreenToDreamStarted() {
		mTransitionFromLockscreenToDreamStarted = true;
		}

		@Override
		public void onOngoingActivityStatusChanged(boolean hasOngoingActivity) {
		mHasOngoingActivity = hasOngoingActivity;
		updateStatusBarVisibilities(/* animate= */ true);
		}
		};

		@Override
		@@ -532,11 +552,14 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
		}
		}

		// The ongoing call chip and notification icon visibilities are intertwined, so update both
		// if either change.
		if (newModel.getShowNotificationIcons() != previousModel.getShowNotificationIcons()
		\|\| newModel.getShowOngoingCallChip() != previousModel.getShowOngoingCallChip()) {
		updateNotificationIconAreaAndCallChip(animate);
		// The ongoing activity chip and notification icon visibilities are intertwined, so update
		// both if either change.
		boolean notifsChanged =
		newModel.getShowNotificationIcons() != previousModel.getShowNotificationIcons();
		boolean ongoingActivityChanged =
		newModel.getShowOngoingActivityChip() != previousModel.getShowOngoingActivityChip();
		if (notifsChanged \|\| ongoingActivityChanged) {
		updateNotificationIconAreaAndOngoingActivityChip(animate);
		}

		// The clock may have already been hidden, but we might want to shift its
		@@ -566,45 +589,58 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
		return new StatusBarVisibilityModel(
		/* showClock= */ false,
		/* showNotificationIcons= */ false,
		/* showOngoingCallChip= */ false,
		/* showOngoingActivityChip= */ false,
		/* showSystemInfo= */ false);
		}

		boolean showClock = externalModel.getShowClock() && !headsUpVisible;
		boolean showOngoingCallChip = mOngoingCallController.hasOngoingCall() && !headsUpVisible;

		boolean showOngoingActivityChip;
		if (Flags.statusBarScreenSharingChips()) {
		// If this flag is on, the ongoing activity status comes from
		// CollapsedStatusBarViewBinder, which updates the mHasOngoingActivity variable.
		showOngoingActivityChip = mHasOngoingActivity;
		} else {
		// If this flag is off, the only ongoing activity is the ongoing call, and we pull it
		// from the controller directly.
		showOngoingActivityChip = mOngoingCallController.hasOngoingCall();
		}

		return new StatusBarVisibilityModel(
		showClock,
		externalModel.getShowNotificationIcons(),
		showOngoingCallChip,
		showOngoingActivityChip && !headsUpVisible,
		externalModel.getShowSystemInfo());
		}

		/**
		* Updates the visibility of the notification icon area and ongoing call chip based on disabled1
		* state.
		* Updates the visibility of the notification icon area and ongoing activity chip based on
		* mLastModifiedVisibility.
		*/
		private void updateNotificationIconAreaAndCallChip(boolean animate) {
		private void updateNotificationIconAreaAndOngoingActivityChip(boolean animate) {
		StatusBarVisibilityModel visibilityModel = mLastModifiedVisibility;
		boolean disableNotifications = !visibilityModel.getShowNotificationIcons();
		boolean hasOngoingCall = visibilityModel.getShowOngoingCallChip();
		boolean hasOngoingActivity = visibilityModel.getShowOngoingActivityChip();

		// Hide notifications if the disable flag is set or we have an ongoing call.
		if (disableNotifications \|\| hasOngoingCall) {
		hideNotificationIconArea(animate && !hasOngoingCall);
		// Hide notifications if the disable flag is set or we have an ongoing activity.
		if (disableNotifications \|\| hasOngoingActivity) {
		hideNotificationIconArea(animate && !hasOngoingActivity);
		} else {
		showNotificationIconArea(animate);
		}

		// Show the ongoing call chip only if there is an ongoing call and notification icons
		// are allowed. (The ongoing call chip occupies the same area as the notification icons,
		// so if the icons are disabled then the call chip should be, too.)
		boolean showOngoingCallChip = hasOngoingCall && !disableNotifications;
		if (showOngoingCallChip) {
		// Show the ongoing activity chip only if there is an ongoing activity and notification
		// icons are allowed. (The ongoing activity chip occupies the same area as the notification,
		// icons so if the icons are disabled then the activity chip should be, too.)
		boolean showOngoingActivityChip = hasOngoingActivity && !disableNotifications;
		if (showOngoingActivityChip) {
		showOngoingActivityChip(animate);
		} else {
		hideOngoingActivityChip(animate);
		}
		mOngoingCallController.notifyChipVisibilityChanged(showOngoingCallChip);
		if (!Flags.statusBarScreenSharingChips()) {
		mOngoingCallController.notifyChipVisibilityChanged(showOngoingActivityChip);
		}
		}

		private boolean shouldHideStatusBar() {
		@@ -702,8 +738,9 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
		/**
		* Displays the ongoing activity chip.
		*
		* For now, this chip will only ever contain the ongoing call information, but after b/332662551
		* feature is implemented, it will support different kinds of ongoing activities.
		* 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);
		@@ -746,7 +783,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
		*/
		private void animateHiddenState(final View v, int state, boolean animate) {
		v.animate().cancel();
		if (!animate) {
		if (!animate \|\| !mAnimationsEnabled) {
		v.setAlpha(0f);
		v.setVisibility(state);
		return;
		@@ -773,7 +810,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
		private void animateShow(View v, boolean animate) {
		v.animate().cancel();
		v.setVisibility(View.VISIBLE);
		if (!animate) {
		if (!animate \|\| !mAnimationsEnabled) {
		v.setAlpha(1f);
		return;
		}
		@@ -872,6 +909,8 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
		@Override
		public void dump(PrintWriter printWriter, String[] args) {
		IndentingPrintWriter pw = new IndentingPrintWriter(printWriter, /* singleIndent= */" ");
		pw.println("mHasOngoingActivity=" + mHasOngoingActivity);
		pw.println("mAnimationsEnabled=" + mAnimationsEnabled);
		StatusBarFragmentComponent component = mStatusBarFragmentComponent;
		if (component == null) {
		pw.println("StatusBarFragmentComponent is null");

packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentLogger.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -59,13 +59,13 @@ class CollapsedStatusBarFragmentLogger @Inject constructor(
		{
		bool1 = model.showClock
		bool2 = model.showNotificationIcons
		bool3 = model.showOngoingCallChip
		bool3 = model.showOngoingActivityChip
		bool4 = model.showSystemInfo
		},
		{ "New visibilities calculated internally. " +
		"showClock=$bool1 " +
		"showNotificationIcons=$bool2 " +
		"showOngoingCallChip=$bool3 " +
		"showOngoingActivityChip=$bool3 " +
		"showSystemInfo=$bool4"
		}
		)

packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/StatusBarVisibilityModel.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ import android.app.StatusBarManager.DISABLE_SYSTEM_INFO
		data class StatusBarVisibilityModel(
		val showClock: Boolean,
		val showNotificationIcons: Boolean,
		val showOngoingCallChip: Boolean,
		val showOngoingActivityChip: Boolean,
		val showSystemInfo: Boolean,
		) {
		companion object {
		@@ -48,7 +48,7 @@ data class StatusBarVisibilityModel(
		showNotificationIcons = (disabled1 and DISABLE_NOTIFICATION_ICONS) == 0,
		// TODO(b/279899176): [CollapsedStatusBarFragment] always overwrites this with the
		// value of [OngoingCallController]. Do we need to process the flag here?
		showOngoingCallChip = (disabled1 and DISABLE_ONGOING_CALL_CHIP) == 0,
		showOngoingActivityChip = (disabled1 and DISABLE_ONGOING_CALL_CHIP) == 0,
		showSystemInfo =
		(disabled1 and DISABLE_SYSTEM_INFO) == 0 &&
		(disabled2 and DISABLE2_SYSTEM_ICONS) == 0