Merge "Move airplane mode icon to SystemUI" into main (b7976007) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/mobile/TelephonyIcons.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -27,9 +27,6 @@ import java.util.Map;
		* Telephony related icons and strings for SysUI and Settings.
		*/
		public class TelephonyIcons {
		//***** Data connection icons
		public static final int FLIGHT_MODE_ICON = R.drawable.stat_sys_airplane_mode;

		public static final int ICON_LTE =
		flagged(R.drawable.ic_lte_mobiledata, R.drawable.ic_lte_mobiledata_updated);
		public static final int ICON_LTE_PLUS =

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/StatusBarSignalPolicyTest.kt

+5 −5

Original line number	Diff line number	Diff line
		@@ -21,12 +21,12 @@ import android.platform.test.annotations.EnableFlags
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.internal.R
		import com.android.settingslib.mobile.TelephonyIcons
		import com.android.systemui.Flags.FLAG_STATUS_BAR_SIGNAL_POLICY_REFACTOR
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.kosmos.Kosmos
		import com.android.systemui.kosmos.runTest
		import com.android.systemui.kosmos.useUnconfinedTestDispatcher
		import com.android.systemui.res.R.drawable.stat_sys_airplane_mode
		import com.android.systemui.statusbar.connectivity.IconState
		import com.android.systemui.statusbar.connectivity.NetworkController
		import com.android.systemui.statusbar.phone.StatusBarSignalPolicy
		@@ -106,10 +106,10 @@ class StatusBarSignalPolicyTest : SysuiTestCase() {

		// Make sure the legacy code path does not change airplane mode when the refactor
		// flag is enabled.
		underTest.setIsAirplaneMode(IconState(true, TelephonyIcons.FLIGHT_MODE_ICON, ""))
		underTest.setIsAirplaneMode(IconState(true, stat_sys_airplane_mode, ""))
		verify(statusBarIconController, never()).setIconVisibility(eq(slotAirplane), any())

		underTest.setIsAirplaneMode(IconState(false, TelephonyIcons.FLIGHT_MODE_ICON, ""))
		underTest.setIsAirplaneMode(IconState(false, stat_sys_airplane_mode, ""))
		verify(statusBarIconController, never()).setIconVisibility(eq(slotAirplane), any())
		}

		@@ -129,10 +129,10 @@ class StatusBarSignalPolicyTest : SysuiTestCase() {
		kosmos.runTest {
		underTest.init()

		underTest.setIsAirplaneMode(IconState(true, TelephonyIcons.FLIGHT_MODE_ICON, ""))
		underTest.setIsAirplaneMode(IconState(true, stat_sys_airplane_mode, ""))
		verify(statusBarIconController).setIconVisibility(slotAirplane, true)

		underTest.setIsAirplaneMode(IconState(false, TelephonyIcons.FLIGHT_MODE_ICON, ""))
		underTest.setIsAirplaneMode(IconState(false, stat_sys_airplane_mode, ""))
		verify(statusBarIconController).setIconVisibility(slotAirplane, false)
		}

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/connectivity/CallbackHandlerTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -179,7 +179,7 @@ public class CallbackHandlerTest extends SysuiTestCase {
		@Test
		public void testSignalCallback_setIsAirplaneMode() {
		IconState state =
		new IconState(true, com.android.settingslib.R.drawable.stat_sys_airplane_mode, "Test Description");
		new IconState(true, com.android.systemui.res.R.drawable.stat_sys_airplane_mode, "Test Description");
		mHandler.setIsAirplaneMode(state);
		waitForCallbacks();

packages/SettingsLib/res/drawable/stat_sys_airplane_mode.xml→packages/SystemUI/res/drawable/stat_sys_airplane_mode.xml

+0 −0

File moved.

View file

packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -724,7 +724,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
		cb.setIsAirplaneMode(
		new IconState(
		mAirplaneMode,
		TelephonyIcons.FLIGHT_MODE_ICON,
		R.drawable.stat_sys_airplane_mode,
		mContext.getString(R.string.accessibility_airplane_mode)));
		cb.setNoSims(mHasNoSubs, mSimDetected);
		cb.setConnectivityStatus(mNoDefaultNetwork, !mInetCondition, mNoNetworksAvailable);
		@@ -1094,7 +1094,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
		mCallbackHandler.setIsAirplaneMode(
		new IconState(
		mAirplaneMode,
		TelephonyIcons.FLIGHT_MODE_ICON,
		R.drawable.stat_sys_airplane_mode,
		mContext.getString(R.string.accessibility_airplane_mode)));
		mCallbackHandler.setNoSims(mHasNoSubs, mSimDetected);
		}
		@@ -1270,7 +1270,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
		mCallbackHandler.setIsAirplaneMode(
		new IconState(
		show,
		TelephonyIcons.FLIGHT_MODE_ICON,
		R.drawable.stat_sys_airplane_mode,
		mContext.getString(R.string.accessibility_airplane_mode)));
		}
		String fully = args.getString("fully");