Merge "Merge "Hide empty text view when airplane mode" into rvc-dev am:... (eb09a9a6) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/carrier/QSCarrierGroupController.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.os.Looper;
		import android.os.Message;
		import android.provider.Settings;
		import android.telephony.SubscriptionManager;
		import android.text.TextUtils;
		import android.util.Log;
		import android.view.View;
		import android.widget.TextView;
		@@ -260,8 +261,10 @@ public class QSCarrierGroupController {
		mCarrierGroups[i].setVisibility(View.GONE);
		}
		mNoSimTextView.setText(info.carrierText);
		if (!TextUtils.isEmpty(info.carrierText)) {
		mNoSimTextView.setVisibility(View.VISIBLE);
		}
		}
		handleUpdateState(); // handleUpdateCarrierInfo is always called from main thread.
		}

+15 −0

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

		package com.android.systemui.qs.carrier;

		import static org.junit.Assert.assertEquals;
		import static org.mockito.ArgumentMatchers.any;
		import static org.mockito.ArgumentMatchers.anyBoolean;
		import static org.mockito.ArgumentMatchers.anyInt;
		@@ -219,4 +220,18 @@ public class QSCarrierGroupControllerTest extends LeakCheckedTest {
		mock(NetworkController.IconState.class),
		0, 0, true, true, "", "", "", true, 0, true);
		}

		@Test
		public void testNoEmptyVisibleView_airplaneMode() {
		CarrierTextController.CarrierTextCallbackInfo
		info = new CarrierTextController.CarrierTextCallbackInfo(
		"",
		new CharSequence[]{""},
		true,
		new int[]{0},
		true /* airplaneMode */);
		mCallback.updateCarrierInfo(info);
		mTestableLooper.processAllMessages();
		assertEquals(View.GONE, mQSCarrierGroup.getNoSimTextView().getVisibility());
		}
		}