Revert "[Satellite] DeviceBasedSatelliteBindableIcon" (1cad7854) · Commits · e / os / android_frameworks_base

core/res/res/values/config.xml

+0 −2

Original line number	Diff line number	Diff line
		@@ -57,7 +57,6 @@
		<item><xliff:g id="id">@string/status_bar_screen_record</xliff:g></item>
		<item><xliff:g id="id">@string/status_bar_cast</xliff:g></item>
		<item><xliff:g id="id">@string/status_bar_ethernet</xliff:g></item>
		<item><xliff:g id="id">@string/status_bar_oem_satellite</xliff:g></item>
		<item><xliff:g id="id">@string/status_bar_wifi</xliff:g></item>
		<item><xliff:g id="id">@string/status_bar_hotspot</xliff:g></item>
		<item><xliff:g id="id">@string/status_bar_mobile</xliff:g></item>
		@@ -103,7 +102,6 @@
		<string translatable="false" name="status_bar_call_strength">call_strength</string>
		<string translatable="false" name="status_bar_sensors_off">sensors_off</string>
		<string translatable="false" name="status_bar_screen_record">screen_record</string>
		<string translatable="false" name="status_bar_oem_satellite">satellite</string>

		<!-- Flag indicating whether the surface flinger has limited
		alpha compositing functionality in hardware. If set, the window

core/res/res/values/symbols.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -3198,7 +3198,6 @@
		<java-symbol type="string" name="status_bar_camera" />
		<java-symbol type="string" name="status_bar_sensors_off" />
		<java-symbol type="string" name="status_bar_screen_record" />
		<java-symbol type="string" name="status_bar_oem_satellite" />

		<!-- Locale picker -->
		<java-symbol type="id" name="locale_search_menu" />

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/icons/shared/BindableIconsRegistry.kt

+2 −4

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package com.android.systemui.statusbar.pipeline.icons.shared

		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.statusbar.pipeline.icons.shared.model.BindableIcon
		import com.android.systemui.statusbar.pipeline.satellite.ui.DeviceBasedSatelliteBindableIcon
		import javax.inject.Inject

		/**
		@@ -40,11 +39,10 @@ class BindableIconsRegistryImpl
		@Inject
		constructor(
		/** Bindables go here */
		oemSatellite: DeviceBasedSatelliteBindableIcon
		) : BindableIconsRegistry {
		/**
		* Adding the injected bindables to this list will get them registered with
		* StatusBarIconController
		*/
		override val bindableIcons: List<BindableIcon> = listOf(oemSatellite)
		override val bindableIcons: List<BindableIcon> = listOf()
		}

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/satellite/data/prod/DeviceBasedSatelliteRepositoryImpl.kt

+4 −19

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package com.android.systemui.statusbar.pipeline.satellite.data.prod
		import android.os.OutcomeReceiver
		import android.telephony.satellite.NtnSignalStrengthCallback
		import android.telephony.satellite.SatelliteManager
		import android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_SUCCESS
		import android.telephony.satellite.SatelliteModemStateCallback
		import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow
		import com.android.systemui.dagger.SysUISingleton
		@@ -185,17 +184,9 @@ constructor(
		trySend(SatelliteConnectionState.fromModemState(state))
		}

		var registered = false

		try {
		val res =
		sm.registerForSatelliteModemStateChanged(bgDispatcher.asExecutor(), cb)
		registered = res == SATELLITE_RESULT_SUCCESS
		} catch (e: Exception) {
		// Logging is in next commit
		}

		awaitClose { if (registered) sm.unregisterForSatelliteModemStateChanged(cb) }
		awaitClose { sm.unregisterForSatelliteModemStateChanged(cb) }
		}
		.flowOn(bgDispatcher)

		@@ -209,15 +200,9 @@ constructor(
		trySend(signalStrength.level)
		}

		var registered = false
		try {
		sm.registerForNtnSignalStrengthChanged(bgDispatcher.asExecutor(), cb)
		registered = true
		} catch (e: Exception) {
		// Logging is in next commit
		}

		awaitClose { if (registered) sm.unregisterForNtnSignalStrengthChanged(cb) }
		awaitClose { sm.unregisterForNtnSignalStrengthChanged(cb) }
		}
		.flowOn(bgDispatcher)

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/satellite/ui/DeviceBasedSatelliteBindableIcon.kt

deleted100644 → 0

+0 −46

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.pipeline.satellite.ui

		import android.content.Context
		import com.android.internal.telephony.flags.Flags.oemEnabledSatelliteFlag
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.statusbar.pipeline.icons.shared.model.BindableIcon
		import com.android.systemui.statusbar.pipeline.icons.shared.model.ModernStatusBarViewCreator
		import com.android.systemui.statusbar.pipeline.satellite.ui.binder.DeviceBasedSatelliteIconBinder
		import com.android.systemui.statusbar.pipeline.satellite.ui.viewmodel.DeviceBasedSatelliteViewModel
		import com.android.systemui.statusbar.pipeline.shared.ui.view.SingleBindableStatusBarIconView
		import javax.inject.Inject

		@SysUISingleton
		class DeviceBasedSatelliteBindableIcon
		@Inject
		constructor(
		context: Context,
		viewModel: DeviceBasedSatelliteViewModel,
		) : BindableIcon {
		override val slot: String =
		context.getString(com.android.internal.R.string.status_bar_oem_satellite)

		override val initializer = ModernStatusBarViewCreator { context ->
		SingleBindableStatusBarIconView.createView(context).also { view ->
		view.initView(slot) { DeviceBasedSatelliteIconBinder.bind(view, viewModel) }
		}
		}

		override val shouldBindIcon: Boolean = oemEnabledSatelliteFlag()
		}