From 10b4c8a4ab3fc1fd55e5a636066e210ad17cf92b Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Fri, 26 May 2017 13:52:59 -0400 Subject: [PATCH] Make QS signal indicator act like a QS signal indicator It had the behavior of the status bar before, so switch it over to QS behavior but keep status bar icons for the appearance. Ditch the old QS data icons because we no longer need them. Test: runtest systemui Change-Id: I1356bbc19c4874ae467e192b9129136ebd0a37c8 Fixes: 62128809 --- .../SystemUI/res/drawable/ic_qs_signal_1x.xml | 27 --------------- .../SystemUI/res/drawable/ic_qs_signal_3g.xml | 27 --------------- .../SystemUI/res/drawable/ic_qs_signal_4g.xml | 27 --------------- .../res/drawable/ic_qs_signal_4g_plus.xml | 30 ----------------- .../res/drawable/ic_qs_signal_disabled.xml | 28 ---------------- .../SystemUI/res/drawable/ic_qs_signal_e.xml | 27 --------------- .../SystemUI/res/drawable/ic_qs_signal_g.xml | 26 --------------- .../SystemUI/res/drawable/ic_qs_signal_h.xml | 27 --------------- .../res/drawable/ic_qs_signal_lte.xml | 30 ----------------- .../res/drawable/ic_qs_signal_lte_plus.xml | 33 ------------------- .../systemui/qs/QuickStatusBarHeader.java | 4 +-- .../systemui/statusbar/SignalClusterView.java | 20 +++++++---- .../policy/MobileSignalController.java | 9 ++--- .../statusbar/policy/TelephonyIcons.java | 32 ++++++------------ .../statusbar/policy/CallbackHandlerTest.java | 2 +- .../policy/NetworkControllerBaseTest.java | 2 +- .../policy/NetworkControllerDataTest.java | 22 ++++++------- .../policy/NetworkControllerSignalTest.java | 2 +- 18 files changed, 40 insertions(+), 335 deletions(-) delete mode 100644 packages/SystemUI/res/drawable/ic_qs_signal_1x.xml delete mode 100644 packages/SystemUI/res/drawable/ic_qs_signal_3g.xml delete mode 100644 packages/SystemUI/res/drawable/ic_qs_signal_4g.xml delete mode 100644 packages/SystemUI/res/drawable/ic_qs_signal_4g_plus.xml delete mode 100644 packages/SystemUI/res/drawable/ic_qs_signal_disabled.xml delete mode 100644 packages/SystemUI/res/drawable/ic_qs_signal_e.xml delete mode 100644 packages/SystemUI/res/drawable/ic_qs_signal_g.xml delete mode 100644 packages/SystemUI/res/drawable/ic_qs_signal_h.xml delete mode 100644 packages/SystemUI/res/drawable/ic_qs_signal_lte.xml delete mode 100644 packages/SystemUI/res/drawable/ic_qs_signal_lte_plus.xml diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_1x.xml b/packages/SystemUI/res/drawable/ic_qs_signal_1x.xml deleted file mode 100644 index 195849a932beb..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_signal_1x.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_3g.xml b/packages/SystemUI/res/drawable/ic_qs_signal_3g.xml deleted file mode 100644 index 68c43074d33f7..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_signal_3g.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_4g.xml b/packages/SystemUI/res/drawable/ic_qs_signal_4g.xml deleted file mode 100644 index 61ecc9c02a45e..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_signal_4g.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_4g_plus.xml b/packages/SystemUI/res/drawable/ic_qs_signal_4g_plus.xml deleted file mode 100644 index 782fbe4853d3a..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_signal_4g_plus.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_disabled.xml b/packages/SystemUI/res/drawable/ic_qs_signal_disabled.xml deleted file mode 100644 index dd5843d1183ab..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_signal_disabled.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_e.xml b/packages/SystemUI/res/drawable/ic_qs_signal_e.xml deleted file mode 100644 index 42321263f3972..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_signal_e.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_g.xml b/packages/SystemUI/res/drawable/ic_qs_signal_g.xml deleted file mode 100644 index 0c512d74ce310..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_signal_g.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_h.xml b/packages/SystemUI/res/drawable/ic_qs_signal_h.xml deleted file mode 100644 index b9572b26501b6..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_signal_h.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_lte.xml b/packages/SystemUI/res/drawable/ic_qs_signal_lte.xml deleted file mode 100644 index a381d03e272ad..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_signal_lte.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_lte_plus.xml b/packages/SystemUI/res/drawable/ic_qs_signal_lte_plus.xml deleted file mode 100644 index 3bed28a33609e..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_signal_lte_plus.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java index e457d7247434f..abafd64e3707e 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java @@ -23,13 +23,11 @@ import android.support.annotation.VisibleForTesting; import android.util.AttributeSet; import android.view.View; import android.widget.RelativeLayout; -import android.widget.TextClock; import com.android.settingslib.Utils; import com.android.systemui.BatteryMeterView; import com.android.systemui.Dependency; import com.android.systemui.R; -import com.android.systemui.R.id; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.qs.QSDetail.Callback; import com.android.systemui.statusbar.SignalClusterView; @@ -79,7 +77,7 @@ public class QuickStatusBarHeader extends RelativeLayout { battery.setForceShowPercent(true); // Don't show the Wi-Fi indicator here, because it is shown just below in the tile. SignalClusterView signalCluster = findViewById(R.id.signal_cluster); - signalCluster.setForceBlockWifi(); + signalCluster.setQsSignalCluster(); mActivityStarter = Dependency.get(ActivityStarter.class); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java index 28a858c066ce7..b4822ca760658 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java @@ -121,6 +121,7 @@ public class SignalClusterView extends LinearLayout implements NetworkController private boolean mBlockEthernet; private boolean mActivityEnabled; private boolean mForceBlockWifi; + private boolean mQsSignal; public SignalClusterView(Context context) { this(context, null); @@ -152,9 +153,10 @@ public class SignalClusterView extends LinearLayout implements NetworkController updateActivityEnabled(); } - public void setForceBlockWifi() { + public void setQsSignalCluster() { mForceBlockWifi = true; mBlockWifi = true; + mQsSignal = true; if (isAttachedToWindow()) { // Re-register to get new callbacks. mNetworkController.removeCallback(this); @@ -299,19 +301,23 @@ public class SignalClusterView extends LinearLayout implements NetworkController } @Override - public void setMobileDataIndicators(IconState statusIcon, IconState qsIcon, int statusType, + public void setMobileDataIndicators(IconState icon, IconState qsIcon, int type, int qsType, boolean activityIn, boolean activityOut, String typeContentDescription, String description, boolean isWide, int subId, boolean roaming) { PhoneState state = getState(subId); if (state == null) { return; } - state.mMobileVisible = statusIcon.visible && !mBlockMobile; - state.mMobileStrengthId = statusIcon.icon; - state.mMobileTypeId = statusType; - state.mMobileDescription = statusIcon.contentDescription; + if (mQsSignal) { + icon = qsIcon; + type = qsType; + } + state.mMobileVisible = icon.visible && !mBlockMobile; + state.mMobileStrengthId = icon.icon; + state.mMobileTypeId = type; + state.mMobileDescription = icon.contentDescription; state.mMobileTypeDescription = typeContentDescription; - state.mIsMobileTypeIconWide = statusType != 0 && isWide; + state.mIsMobileTypeIconWide = type != 0 && isWide; state.mRoaming = roaming; state.mActivityIn = activityIn && mActivityEnabled; state.mActivityOut = activityOut && mActivityEnabled; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java index 67b5596e34c94..03a50a209de17 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java @@ -252,11 +252,6 @@ public class MobileSignalController extends SignalController< } } - @Override - public int getQsCurrentIconId() { - return getCurrentIconId(); - } - @Override public void notifyListeners(SignalCallback callback) { MobileIconGroup icons = getIcons(); @@ -276,9 +271,9 @@ public class MobileSignalController extends SignalController< String description = null; // Only send data sim callbacks to QS. if (mCurrentState.dataSim) { - qsTypeIcon = showDataIcon ? icons.mQsDataType : 0; + qsTypeIcon = showDataIcon ? icons.mDataType : 0; qsIcon = new IconState(mCurrentState.enabled - && !mCurrentState.isEmergency, getQsCurrentIconId(), contentDescription); + && !mCurrentState.isEmergency, getCurrentIconId(), contentDescription); description = mCurrentState.isEmergency ? null : mCurrentState.networkName; } boolean activityIn = mCurrentState.dataConnected diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java index aaa0568a72cde..d91ae39bc9209 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java @@ -22,16 +22,6 @@ import com.android.systemui.statusbar.policy.MobileSignalController.MobileIconGr class TelephonyIcons { //***** Data connection icons - static final int QS_DATA_G = R.drawable.ic_qs_signal_g; - static final int QS_DATA_3G = R.drawable.ic_qs_signal_3g; - static final int QS_DATA_E = R.drawable.ic_qs_signal_e; - static final int QS_DATA_H = R.drawable.ic_qs_signal_h; - static final int QS_DATA_1X = R.drawable.ic_qs_signal_1x; - static final int QS_DATA_4G = R.drawable.ic_qs_signal_4g; - static final int QS_DATA_4G_PLUS = R.drawable.ic_qs_signal_4g_plus; - static final int QS_DATA_LTE = R.drawable.ic_qs_signal_lte; - static final int QS_DATA_LTE_PLUS = R.drawable.ic_qs_signal_lte_plus; - static final int FLIGHT_MODE_ICON = R.drawable.stat_sys_airplane_mode; static final int ICON_LTE = R.drawable.stat_sys_data_fully_connected_lte; @@ -46,8 +36,6 @@ class TelephonyIcons { static final int ICON_DATA_DISABLED = R.drawable.stat_sys_data_disabled; - static final int QS_ICON_DATA_DISABLED = R.drawable.ic_qs_data_disabled; - static final MobileIconGroup CARRIER_NETWORK_CHANGE = new MobileIconGroup( "CARRIER_NETWORK_CHANGE", null, @@ -75,7 +63,7 @@ class TelephonyIcons { R.string.accessibility_data_connection_3g, TelephonyIcons.ICON_3G, true, - TelephonyIcons.QS_DATA_3G + TelephonyIcons.ICON_3G ); static final MobileIconGroup WFC = new MobileIconGroup( @@ -114,7 +102,7 @@ class TelephonyIcons { R.string.accessibility_data_connection_edge, TelephonyIcons.ICON_E, false, - TelephonyIcons.QS_DATA_E + TelephonyIcons.ICON_E ); static final MobileIconGroup ONE_X = new MobileIconGroup( @@ -129,7 +117,7 @@ class TelephonyIcons { R.string.accessibility_data_connection_cdma, TelephonyIcons.ICON_1X, true, - TelephonyIcons.QS_DATA_1X + TelephonyIcons.ICON_1X ); static final MobileIconGroup G = new MobileIconGroup( @@ -144,7 +132,7 @@ class TelephonyIcons { R.string.accessibility_data_connection_gprs, TelephonyIcons.ICON_G, false, - TelephonyIcons.QS_DATA_G + TelephonyIcons.ICON_G ); static final MobileIconGroup H = new MobileIconGroup( @@ -159,7 +147,7 @@ class TelephonyIcons { R.string.accessibility_data_connection_3_5g, TelephonyIcons.ICON_H, false, - TelephonyIcons.QS_DATA_H + TelephonyIcons.ICON_H ); static final MobileIconGroup FOUR_G = new MobileIconGroup( @@ -174,7 +162,7 @@ class TelephonyIcons { R.string.accessibility_data_connection_4g, TelephonyIcons.ICON_4G, true, - TelephonyIcons.QS_DATA_4G + TelephonyIcons.ICON_4G ); static final MobileIconGroup FOUR_G_PLUS = new MobileIconGroup( @@ -189,7 +177,7 @@ class TelephonyIcons { R.string.accessibility_data_connection_4g_plus, TelephonyIcons.ICON_4G_PLUS, true, - TelephonyIcons.QS_DATA_4G_PLUS + TelephonyIcons.ICON_4G_PLUS ); static final MobileIconGroup LTE = new MobileIconGroup( @@ -204,7 +192,7 @@ class TelephonyIcons { R.string.accessibility_data_connection_lte, TelephonyIcons.ICON_LTE, true, - TelephonyIcons.QS_DATA_LTE + TelephonyIcons.ICON_LTE ); static final MobileIconGroup LTE_PLUS = new MobileIconGroup( @@ -219,7 +207,7 @@ class TelephonyIcons { R.string.accessibility_data_connection_lte_plus, TelephonyIcons.ICON_LTE_PLUS, true, - TelephonyIcons.QS_DATA_LTE_PLUS + TelephonyIcons.ICON_LTE_PLUS ); static final MobileIconGroup DATA_DISABLED = new MobileIconGroup( @@ -234,7 +222,7 @@ class TelephonyIcons { R.string.accessibility_cell_data_off, TelephonyIcons.ICON_DATA_DISABLED, false, - TelephonyIcons.QS_ICON_DATA_DISABLED + TelephonyIcons.ICON_DATA_DISABLED ); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackHandlerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackHandlerTest.java index cb20639676399..6157d44d13194 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackHandlerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackHandlerTest.java @@ -111,7 +111,7 @@ public class CallbackHandlerTest extends SysuiTestCase { String typeDescription = "Test 1"; String description = "Test 2"; int type = R.drawable.stat_sys_data_fully_connected_1x; - int qsType = R.drawable.ic_qs_signal_1x; + int qsType = type; boolean wide = true; int subId = 5; boolean roaming = true; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java index 505e1d8346fd8..c233fea3c4951 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java @@ -70,7 +70,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase { protected static final int DEFAULT_SIGNAL_STRENGTH = DEFAULT_LEVEL; protected static final int DEFAULT_QS_SIGNAL_STRENGTH = DEFAULT_LEVEL; protected static final int DEFAULT_ICON = TelephonyIcons.ICON_3G; - protected static final int DEFAULT_QS_ICON = TelephonyIcons.QS_DATA_3G; + protected static final int DEFAULT_QS_ICON = DEFAULT_ICON; protected NetworkControllerImpl mNetworkController; protected MobileSignalController mMobileSignalController; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java index dfe00f95fe4d0..ac64263c3eb97 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java @@ -25,7 +25,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { setupDefaultSignal(); verifyDataIndicators(TelephonyIcons.ICON_3G, - TelephonyIcons.QS_DATA_3G); + TelephonyIcons.ICON_3G); } @Test @@ -35,7 +35,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { TelephonyManager.NETWORK_TYPE_GSM); verifyDataIndicators(TelephonyIcons.ICON_G, - TelephonyIcons.QS_DATA_G); + TelephonyIcons.ICON_G); } @Test @@ -45,7 +45,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { TelephonyManager.NETWORK_TYPE_CDMA); verifyDataIndicators(TelephonyIcons.ICON_1X, - TelephonyIcons.QS_DATA_1X); + TelephonyIcons.ICON_1X); } @Test @@ -55,7 +55,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { TelephonyManager.NETWORK_TYPE_EDGE); verifyDataIndicators(TelephonyIcons.ICON_E, - TelephonyIcons.QS_DATA_E); + TelephonyIcons.ICON_E); } @Test @@ -65,7 +65,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { TelephonyManager.NETWORK_TYPE_LTE); verifyDataIndicators(TelephonyIcons.ICON_LTE, - TelephonyIcons.QS_DATA_LTE); + TelephonyIcons.ICON_LTE); } @Test @@ -75,7 +75,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { TelephonyManager.NETWORK_TYPE_HSPA); verifyDataIndicators(TelephonyIcons.ICON_H, - TelephonyIcons.QS_DATA_H); + TelephonyIcons.ICON_H); } @Test @@ -104,7 +104,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { TelephonyManager.NETWORK_TYPE_LTE); verifyDataIndicators(TelephonyIcons.ICON_4G, - TelephonyIcons.QS_DATA_4G); + TelephonyIcons.ICON_4G); } @Ignore("Flaky") @@ -117,7 +117,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { setConnectivity(NetworkCapabilities.TRANSPORT_CELLULAR, false, false); verifyDataIndicators(TelephonyIcons.ICON_DATA_DISABLED, - TelephonyIcons.QS_ICON_DATA_DISABLED); + TelephonyIcons.ICON_DATA_DISABLED); } @Test @@ -148,7 +148,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { mNetworkController.handleConfigurationChanged(); verifyDataIndicators(TelephonyIcons.ICON_4G, - TelephonyIcons.QS_DATA_4G); + TelephonyIcons.ICON_4G); } @Test @@ -158,13 +158,13 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { TelephonyManager.NETWORK_TYPE_LTE); verifyDataIndicators(TelephonyIcons.ICON_LTE, - TelephonyIcons.QS_DATA_LTE); + TelephonyIcons.ICON_LTE); when(mServiceState.getDataNetworkType()) .thenReturn(TelephonyManager.NETWORK_TYPE_HSPA); updateServiceState(); verifyDataIndicators(TelephonyIcons.ICON_H, - TelephonyIcons.QS_DATA_H); + TelephonyIcons.ICON_H); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java index 1627925ae1bcb..aa62075530eb0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java @@ -214,7 +214,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { verifyLastQsMobileDataIndicators(true, testStrength, - TelephonyIcons.QS_DATA_1X, false, false); + TelephonyIcons.ICON_1X, false, false); } }