Merge "[Ongoing Call Chip] Add feature flag + controller" into sc-dev (4be0810f) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -9150,9 +9150,12 @@ public class Notification implements Parcelable
		* </pre>
		*/
		public static class CallStyle extends Style {
		private static final int CALL_TYPE_INCOMING = 1;
		private static final int CALL_TYPE_ONGOING = 2;
		private static final int CALL_TYPE_SCREENING = 3;
		/** @hide */
		public static final int CALL_TYPE_INCOMING = 1;
		/** @hide */
		public static final int CALL_TYPE_ONGOING = 2;
		/** @hide */
		public static final int CALL_TYPE_SCREENING = 3;

		/**
		* This is a key used privately on the action.extras to give spacing priority

packages/SystemUI/res/values/flags.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -50,4 +50,6 @@
		<bool name="flag_alarm_tile">false</bool>

		<bool name="flag_charging_ripple">false</bool>

		<bool name="flag_ongoing_call_status_bar_chip">false</bool>
		</resources>

packages/SystemUI/src/com/android/systemui/fragments/FragmentService.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.view.View;
		import com.android.systemui.Dumpable;
		import com.android.systemui.dagger.SysUISingleton;
		import com.android.systemui.qs.QSFragment;
		import com.android.systemui.statusbar.phone.CollapsedStatusBarFragment;
		import com.android.systemui.statusbar.policy.ConfigurationController;

		import java.io.FileDescriptor;
		@@ -128,6 +129,9 @@ public class FragmentService implements Dumpable {
		* Inject a QSFragment.
		*/
		QSFragment createQSFragment();

		/** Inject a CollapsedStatusBarFragment. */
		CollapsedStatusBarFragment createCollapsedStatusBarFragment();
		}

		private class FragmentHostState {

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -98,4 +98,8 @@ public class FeatureFlags {
		public boolean isChargingRippleEnabled() {
		return mFlagReader.isEnabled(R.bool.flag_charging_ripple);
		}

		public boolean isOngoingCallStatusBarChipEnabled() {
		return mFlagReader.isEnabled(R.bool.flag_ongoing_call_status_bar_chip);
		}
		}

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

+14 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ import com.android.systemui.statusbar.notification.collection.NotifPipeline;
		import com.android.systemui.statusbar.notification.collection.inflation.LowPriorityInflationHelper;
		import com.android.systemui.statusbar.notification.collection.legacy.NotificationGroupManagerLegacy;
		import com.android.systemui.statusbar.notification.collection.legacy.VisualStabilityManager;
		import com.android.systemui.statusbar.notification.collection.notifcollection.CommonNotifCollection;
		import com.android.systemui.statusbar.notification.stack.ForegroundServiceSectionController;
		import com.android.systemui.statusbar.phone.KeyguardBypassController;
		import com.android.systemui.statusbar.phone.ManagedProfileController;
		@@ -57,6 +58,7 @@ import com.android.systemui.statusbar.phone.StatusBar;
		import com.android.systemui.statusbar.phone.StatusBarIconController;
		import com.android.systemui.statusbar.phone.StatusBarIconControllerImpl;
		import com.android.systemui.statusbar.phone.StatusBarRemoteInputCallback;
		import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController;
		import com.android.systemui.statusbar.policy.RemoteInputUriController;
		import com.android.systemui.tracing.ProtoTracer;
		import com.android.systemui.util.DeviceConfigProxy;
		@@ -226,4 +228,16 @@ public interface StatusBarDependenciesModule {
		@Binds
		StatusBarIconController provideStatusBarIconController(
		StatusBarIconControllerImpl controllerImpl);

		/**
		*/
		@Provides
		@SysUISingleton
		static OngoingCallController provideOngoingCallController(
		CommonNotifCollection notifCollection, FeatureFlags featureFlags) {
		OngoingCallController ongoingCallController =
		new OngoingCallController(notifCollection, featureFlags);
		ongoingCallController.init();
		return ongoingCallController;
		}
		}