From 01df36f37fc470d3fd8c120b09cc4e7943cfacfb Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Wed, 7 Jun 2017 13:02:47 -0400 Subject: Move QS cell indicator back into mobile data tile Remove it from the header and drop it back in its old location. This reverts commit 10b4c8a4ab3fc1fd55e5a636066e210ad17cf92b. Test: runtest systemui Fixes: 62331189 Change-Id: I087589c256894e0972656619e665b6a16536ce6c --- .../com/android/systemui/plugins/qs/QSTile.java | 8 ++- .../SystemUI/res/drawable/ic_qs_data_disabled.xml | 9 ++-- packages/SystemUI/res/drawable/ic_qs_signal_1x.xml | 28 ++++++++++ packages/SystemUI/res/drawable/ic_qs_signal_3g.xml | 28 ++++++++++ packages/SystemUI/res/drawable/ic_qs_signal_4g.xml | 28 ++++++++++ .../SystemUI/res/drawable/ic_qs_signal_4g_plus.xml | 31 +++++++++++ .../res/drawable/ic_qs_signal_disabled.xml | 29 ++++++++++ packages/SystemUI/res/drawable/ic_qs_signal_e.xml | 28 ++++++++++ packages/SystemUI/res/drawable/ic_qs_signal_g.xml | 27 ++++++++++ packages/SystemUI/res/drawable/ic_qs_signal_h.xml | 28 ++++++++++ .../SystemUI/res/drawable/ic_qs_signal_lte.xml | 31 +++++++++++ .../res/drawable/ic_qs_signal_lte_plus.xml | 34 ++++++++++++ .../layout/quick_status_bar_expanded_header.xml | 11 ++-- .../src/com/android/systemui/qs/CellTileView.java | 55 ++++++++++++------- .../android/systemui/qs/QuickStatusBarHeader.java | 6 +-- .../com/android/systemui/qs/SignalTileView.java | 16 +++++- .../android/systemui/qs/tiles/CellularTile.java | 31 ++++++----- .../systemui/statusbar/SignalClusterView.java | 20 +++---- .../systemui/statusbar/phone/SignalDrawable.java | 6 ++- .../statusbar/policy/MobileSignalController.java | 9 +++- .../systemui/statusbar/policy/TelephonyIcons.java | 32 ++++++++---- .../systemui/statusbar/SignalClusterViewTest.java | 61 ---------------------- .../statusbar/policy/CallbackHandlerTest.java | 2 +- .../policy/NetworkControllerBaseTest.java | 2 +- .../policy/NetworkControllerDataTest.java | 22 ++++---- .../policy/NetworkControllerSignalTest.java | 2 +- 26 files changed, 434 insertions(+), 150 deletions(-) create mode 100644 packages/SystemUI/res/drawable/ic_qs_signal_1x.xml create mode 100644 packages/SystemUI/res/drawable/ic_qs_signal_3g.xml create mode 100644 packages/SystemUI/res/drawable/ic_qs_signal_4g.xml create mode 100644 packages/SystemUI/res/drawable/ic_qs_signal_4g_plus.xml create mode 100644 packages/SystemUI/res/drawable/ic_qs_signal_disabled.xml create mode 100644 packages/SystemUI/res/drawable/ic_qs_signal_e.xml create mode 100644 packages/SystemUI/res/drawable/ic_qs_signal_g.xml create mode 100644 packages/SystemUI/res/drawable/ic_qs_signal_h.xml create mode 100644 packages/SystemUI/res/drawable/ic_qs_signal_lte.xml create mode 100644 packages/SystemUI/res/drawable/ic_qs_signal_lte_plus.xml delete mode 100644 packages/SystemUI/tests/src/com/android/systemui/statusbar/SignalClusterViewTest.java diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java b/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java index 9ef05c5d4125..ed62b7177096 100644 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java +++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java @@ -198,14 +198,20 @@ public interface QSTile { public static final int VERSION = 1; public boolean activityIn; public boolean activityOut; + public boolean isOverlayIconWide; + public int overlayIconId; @Override public boolean copyTo(State other) { final SignalState o = (SignalState) other; final boolean changed = o.activityIn != activityIn - || o.activityOut != activityOut; + || o.activityOut != activityOut + || o.isOverlayIconWide != isOverlayIconWide + || o.overlayIconId != overlayIconId; o.activityIn = activityIn; o.activityOut = activityOut; + o.isOverlayIconWide = isOverlayIconWide; + o.overlayIconId = overlayIconId; return super.copyTo(other) || changed; } diff --git a/packages/SystemUI/res/drawable/ic_qs_data_disabled.xml b/packages/SystemUI/res/drawable/ic_qs_data_disabled.xml index 6264484a74d8..8b5e4b0a6da0 100644 --- a/packages/SystemUI/res/drawable/ic_qs_data_disabled.xml +++ b/packages/SystemUI/res/drawable/ic_qs_data_disabled.xml @@ -14,10 +14,11 @@ limitations under the License. --> + android:width="24dp" + android:height="24.0dp" + android:viewportWidth="40.0" + android:viewportHeight="40.0" + android:tint="?android:attr/colorControlNormal"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_1x.xml b/packages/SystemUI/res/drawable/ic_qs_signal_1x.xml new file mode 100644 index 000000000000..15d521fbeb4e --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_signal_1x.xml @@ -0,0 +1,28 @@ + + + + + diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_3g.xml b/packages/SystemUI/res/drawable/ic_qs_signal_3g.xml new file mode 100644 index 000000000000..ce37331dd62d --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_signal_3g.xml @@ -0,0 +1,28 @@ + + + + + diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_4g.xml b/packages/SystemUI/res/drawable/ic_qs_signal_4g.xml new file mode 100644 index 000000000000..4a8d0abf755a --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_signal_4g.xml @@ -0,0 +1,28 @@ + + + + + diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_4g_plus.xml b/packages/SystemUI/res/drawable/ic_qs_signal_4g_plus.xml new file mode 100644 index 000000000000..e0c6b68cf618 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_signal_4g_plus.xml @@ -0,0 +1,31 @@ + + + + + + diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_disabled.xml b/packages/SystemUI/res/drawable/ic_qs_signal_disabled.xml new file mode 100644 index 000000000000..c841a66fa8f4 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_signal_disabled.xml @@ -0,0 +1,29 @@ + + + + + diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_e.xml b/packages/SystemUI/res/drawable/ic_qs_signal_e.xml new file mode 100644 index 000000000000..552550883c10 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_signal_e.xml @@ -0,0 +1,28 @@ + + + + + + diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_g.xml b/packages/SystemUI/res/drawable/ic_qs_signal_g.xml new file mode 100644 index 000000000000..f499fe756484 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_signal_g.xml @@ -0,0 +1,27 @@ + + + + + + diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_h.xml b/packages/SystemUI/res/drawable/ic_qs_signal_h.xml new file mode 100644 index 000000000000..2e6ea23b01e0 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_signal_h.xml @@ -0,0 +1,28 @@ + + + + + + diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_lte.xml b/packages/SystemUI/res/drawable/ic_qs_signal_lte.xml new file mode 100644 index 000000000000..af9c446ce5e9 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_signal_lte.xml @@ -0,0 +1,31 @@ + + + + + + diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_lte_plus.xml b/packages/SystemUI/res/drawable/ic_qs_signal_lte_plus.xml new file mode 100644 index 000000000000..5ff7d8575a77 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_signal_lte_plus.xml @@ -0,0 +1,34 @@ + + + + + + + diff --git a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml index 97376c377b77..1fb254c95f54 100644 --- a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml @@ -56,15 +56,10 @@ android:textColor="?android:attr/textColorPrimary" android:singleLine="true" /> - - - - - + android:layout_width="wrap_content" + /> 0) { + mOverlay.setVisibility(VISIBLE); + mOverlay.setImageResource(s.overlayIconId); + } else { + mOverlay.setVisibility(GONE); + } + if (s.overlayIconId > 0 && s.isOverlayIconWide) { + mSignal.setPaddingRelative(mWideOverlayIconStartPadding, 0, 0, 0); + } else { + mSignal.setPaddingRelative(0, 0, 0, 0); + } final boolean shown = isShown(); setVisibility(mIn, shown, s.activityIn); setVisibility(mOut, shown, s.activityOut); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java index 92ff17a1f029..b52414eeda34 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java @@ -35,6 +35,8 @@ import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.qs.DetailAdapter; import com.android.systemui.plugins.qs.QSIconView; import com.android.systemui.plugins.qs.QSTile.SignalState; +import com.android.systemui.qs.CellTileView; +import com.android.systemui.qs.CellTileView.SignalIcon; import com.android.systemui.qs.QSHost; import com.android.systemui.qs.SignalTileView; import com.android.systemui.qs.tileimpl.QSTileImpl; @@ -83,7 +85,7 @@ public class CellularTile extends QSTileImpl { @Override public QSIconView createTileView(Context context) { - return new SignalTileView(context); + return new CellTileView(context); } @Override @@ -120,23 +122,25 @@ public class CellularTile extends QSTileImpl { final Resources r = mContext.getResources(); state.activityIn = cb.enabled && cb.activityIn; state.activityOut = cb.enabled && cb.activityOut; + state.isOverlayIconWide = cb.isDataTypeIconWide; + state.overlayIconId = cb.dataTypeIconId; state.label = r.getString(R.string.mobile_data); - state.contentDescription = state.label; + final String signalContentDesc = cb.enabled && (cb.mobileSignalIconId > 0) + ? cb.signalContentDescription + : r.getString(R.string.accessibility_no_signal); + if (cb.noSim) { + state.contentDescription = state.label; + } else { + state.contentDescription = signalContentDesc + ", " + state.label; + } + state.expandedAccessibilityClassName = Switch.class.getName(); state.value = mDataController.isMobileDataSupported() && mDataController.isMobileDataEnabled(); - state.icon = ResourceIcon.get(R.drawable.ic_data_unavailable); - state.state = cb.airplaneModeEnabled || !cb.enabled ? Tile.STATE_UNAVAILABLE - : state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE; - if (state.state == Tile.STATE_ACTIVE) { - state.icon = ResourceIcon.get(R.drawable.ic_data_on); - } else if (state.state == Tile.STATE_INACTIVE) { - state.icon = ResourceIcon.get(R.drawable.ic_data_off); - } else { - state.icon = ResourceIcon.get(R.drawable.ic_data_unavailable); - } + state.icon = new SignalIcon(cb.mobileSignalIconId); + state.state = Tile.STATE_ACTIVE; } @Override @@ -163,6 +167,7 @@ public class CellularTile extends QSTileImpl { boolean enabled; boolean wifiEnabled; boolean airplaneModeEnabled; + int mobileSignalIconId; String signalContentDescription; int dataTypeIconId; String dataContentDescription; @@ -192,6 +197,7 @@ public class CellularTile extends QSTileImpl { return; } mInfo.enabled = qsIcon.visible; + mInfo.mobileSignalIconId = qsIcon.icon; mInfo.signalContentDescription = qsIcon.contentDescription; mInfo.dataTypeIconId = qsType; mInfo.dataContentDescription = typeContentDescription; @@ -208,6 +214,7 @@ public class CellularTile extends QSTileImpl { mInfo.noSim = show; if (mInfo.noSim) { // Make sure signal gets cleared out when no sims. + mInfo.mobileSignalIconId = 0; mInfo.dataTypeIconId = 0; // Show a No SIMs description to avoid emergency calls message. mInfo.enabled = true; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java index 18cc8721ff95..6d2a02365222 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java @@ -121,7 +121,6 @@ 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); @@ -153,10 +152,9 @@ public class SignalClusterView extends LinearLayout implements NetworkController updateActivityEnabled(); } - public void setQsSignalCluster() { + public void setForceBlockWifi() { mForceBlockWifi = true; mBlockWifi = true; - mQsSignal = true; if (isAttachedToWindow()) { // Re-register to get new callbacks. mNetworkController.removeCallback(this); @@ -301,23 +299,19 @@ public class SignalClusterView extends LinearLayout implements NetworkController } @Override - public void setMobileDataIndicators(IconState icon, IconState qsIcon, int type, + public void setMobileDataIndicators(IconState statusIcon, IconState qsIcon, int statusType, int qsType, boolean activityIn, boolean activityOut, String typeContentDescription, String description, boolean isWide, int subId, boolean roaming) { PhoneState state = getState(subId); if (state == null) { return; } - if (mQsSignal && qsIcon != null) { - icon = qsIcon; - type = qsType; - } - state.mMobileVisible = icon.visible && !mBlockMobile; - state.mMobileStrengthId = icon.icon; - state.mMobileTypeId = type; - state.mMobileDescription = icon.contentDescription; + state.mMobileVisible = statusIcon.visible && !mBlockMobile; + state.mMobileStrengthId = statusIcon.icon; + state.mMobileTypeId = statusType; + state.mMobileDescription = statusIcon.contentDescription; state.mMobileTypeDescription = typeContentDescription; - state.mIsMobileTypeIconWide = type != 0 && isWide; + state.mIsMobileTypeIconWide = statusType != 0 && isWide; state.mRoaming = roaming; state.mActivityIn = activityIn && mActivityEnabled; state.mActivityOut = activityOut && mActivityEnabled; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SignalDrawable.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SignalDrawable.java index 8cd87910f945..0a638d84cb4a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SignalDrawable.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SignalDrawable.java @@ -91,10 +91,10 @@ public class SignalDrawable extends Drawable { private final Path mFullPath = new Path(); private final Path mForegroundPath = new Path(); private final Path mXPath = new Path(); - private final int mIntrinsicSize; private final Handler mHandler; private float mOldDarkIntensity = -1; private float mNumLevels = 1; + private int mIntrinsicSize; private int mLevel; private int mState; private boolean mVisible; @@ -115,6 +115,10 @@ public class SignalDrawable extends Drawable { setDarkIntensity(0); } + public void setIntrinsicSize(int size) { + mIntrinsicSize = size; + } + @Override public int getIntrinsicWidth() { return mIntrinsicSize; 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 03a50a209de1..67b5596e34c9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java @@ -252,6 +252,11 @@ public class MobileSignalController extends SignalController< } } + @Override + public int getQsCurrentIconId() { + return getCurrentIconId(); + } + @Override public void notifyListeners(SignalCallback callback) { MobileIconGroup icons = getIcons(); @@ -271,9 +276,9 @@ public class MobileSignalController extends SignalController< String description = null; // Only send data sim callbacks to QS. if (mCurrentState.dataSim) { - qsTypeIcon = showDataIcon ? icons.mDataType : 0; + qsTypeIcon = showDataIcon ? icons.mQsDataType : 0; qsIcon = new IconState(mCurrentState.enabled - && !mCurrentState.isEmergency, getCurrentIconId(), contentDescription); + && !mCurrentState.isEmergency, getQsCurrentIconId(), 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 d91ae39bc920..aaa0568a72cd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java @@ -22,6 +22,16 @@ 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; @@ -36,6 +46,8 @@ 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, @@ -63,7 +75,7 @@ class TelephonyIcons { R.string.accessibility_data_connection_3g, TelephonyIcons.ICON_3G, true, - TelephonyIcons.ICON_3G + TelephonyIcons.QS_DATA_3G ); static final MobileIconGroup WFC = new MobileIconGroup( @@ -102,7 +114,7 @@ class TelephonyIcons { R.string.accessibility_data_connection_edge, TelephonyIcons.ICON_E, false, - TelephonyIcons.ICON_E + TelephonyIcons.QS_DATA_E ); static final MobileIconGroup ONE_X = new MobileIconGroup( @@ -117,7 +129,7 @@ class TelephonyIcons { R.string.accessibility_data_connection_cdma, TelephonyIcons.ICON_1X, true, - TelephonyIcons.ICON_1X + TelephonyIcons.QS_DATA_1X ); static final MobileIconGroup G = new MobileIconGroup( @@ -132,7 +144,7 @@ class TelephonyIcons { R.string.accessibility_data_connection_gprs, TelephonyIcons.ICON_G, false, - TelephonyIcons.ICON_G + TelephonyIcons.QS_DATA_G ); static final MobileIconGroup H = new MobileIconGroup( @@ -147,7 +159,7 @@ class TelephonyIcons { R.string.accessibility_data_connection_3_5g, TelephonyIcons.ICON_H, false, - TelephonyIcons.ICON_H + TelephonyIcons.QS_DATA_H ); static final MobileIconGroup FOUR_G = new MobileIconGroup( @@ -162,7 +174,7 @@ class TelephonyIcons { R.string.accessibility_data_connection_4g, TelephonyIcons.ICON_4G, true, - TelephonyIcons.ICON_4G + TelephonyIcons.QS_DATA_4G ); static final MobileIconGroup FOUR_G_PLUS = new MobileIconGroup( @@ -177,7 +189,7 @@ class TelephonyIcons { R.string.accessibility_data_connection_4g_plus, TelephonyIcons.ICON_4G_PLUS, true, - TelephonyIcons.ICON_4G_PLUS + TelephonyIcons.QS_DATA_4G_PLUS ); static final MobileIconGroup LTE = new MobileIconGroup( @@ -192,7 +204,7 @@ class TelephonyIcons { R.string.accessibility_data_connection_lte, TelephonyIcons.ICON_LTE, true, - TelephonyIcons.ICON_LTE + TelephonyIcons.QS_DATA_LTE ); static final MobileIconGroup LTE_PLUS = new MobileIconGroup( @@ -207,7 +219,7 @@ class TelephonyIcons { R.string.accessibility_data_connection_lte_plus, TelephonyIcons.ICON_LTE_PLUS, true, - TelephonyIcons.ICON_LTE_PLUS + TelephonyIcons.QS_DATA_LTE_PLUS ); static final MobileIconGroup DATA_DISABLED = new MobileIconGroup( @@ -222,7 +234,7 @@ class TelephonyIcons { R.string.accessibility_cell_data_off, TelephonyIcons.ICON_DATA_DISABLED, false, - TelephonyIcons.ICON_DATA_DISABLED + TelephonyIcons.QS_ICON_DATA_DISABLED ); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/SignalClusterViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/SignalClusterViewTest.java deleted file mode 100644 index 28a5aa39be80..000000000000 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/SignalClusterViewTest.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (C) 2017 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; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import android.support.test.filters.SmallTest; -import android.telephony.SubscriptionInfo; -import android.testing.AndroidTestingRunner; -import android.testing.TestableLooper.RunWithLooper; -import android.view.LayoutInflater; - -import com.android.systemui.R; -import com.android.systemui.SysuiTestCase; -import com.android.systemui.statusbar.policy.NetworkController.IconState; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - -import java.util.Arrays; - -@RunWith(AndroidTestingRunner.class) -@RunWithLooper -@SmallTest -public class SignalClusterViewTest extends SysuiTestCase { - - private SignalClusterView mSignalCluster; - - @Before - public void setup() { - mSignalCluster = (SignalClusterView) LayoutInflater.from(mContext) - .inflate(R.layout.signal_cluster_view, null); - } - - @Test - public void testNonDefaultSim() { - SubscriptionInfo first = mock(SubscriptionInfo.class); - SubscriptionInfo second = mock(SubscriptionInfo.class); - when(first.getSubscriptionId()).thenReturn(0); - when(second.getSubscriptionId()).thenReturn(1); - mSignalCluster.setSubs(Arrays.asList(first, second)); - mSignalCluster.setQsSignalCluster(); - mSignalCluster.setMobileDataIndicators(new IconState(true, 0, 0, ""), null, 0, 0, - false, false, "", "", false, 1, false); - } - -} \ No newline at end of file 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 6157d44d1319..cb2063967639 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 = type; + int qsType = R.drawable.ic_qs_signal_1x; 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 c233fea3c495..505e1d8346fd 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 = DEFAULT_ICON; + protected static final int DEFAULT_QS_ICON = TelephonyIcons.QS_DATA_3G; 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 ac64263c3eb9..dfe00f95fe4d 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.ICON_3G); + TelephonyIcons.QS_DATA_3G); } @Test @@ -35,7 +35,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { TelephonyManager.NETWORK_TYPE_GSM); verifyDataIndicators(TelephonyIcons.ICON_G, - TelephonyIcons.ICON_G); + TelephonyIcons.QS_DATA_G); } @Test @@ -45,7 +45,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { TelephonyManager.NETWORK_TYPE_CDMA); verifyDataIndicators(TelephonyIcons.ICON_1X, - TelephonyIcons.ICON_1X); + TelephonyIcons.QS_DATA_1X); } @Test @@ -55,7 +55,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { TelephonyManager.NETWORK_TYPE_EDGE); verifyDataIndicators(TelephonyIcons.ICON_E, - TelephonyIcons.ICON_E); + TelephonyIcons.QS_DATA_E); } @Test @@ -65,7 +65,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { TelephonyManager.NETWORK_TYPE_LTE); verifyDataIndicators(TelephonyIcons.ICON_LTE, - TelephonyIcons.ICON_LTE); + TelephonyIcons.QS_DATA_LTE); } @Test @@ -75,7 +75,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { TelephonyManager.NETWORK_TYPE_HSPA); verifyDataIndicators(TelephonyIcons.ICON_H, - TelephonyIcons.ICON_H); + TelephonyIcons.QS_DATA_H); } @Test @@ -104,7 +104,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { TelephonyManager.NETWORK_TYPE_LTE); verifyDataIndicators(TelephonyIcons.ICON_4G, - TelephonyIcons.ICON_4G); + TelephonyIcons.QS_DATA_4G); } @Ignore("Flaky") @@ -117,7 +117,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { setConnectivity(NetworkCapabilities.TRANSPORT_CELLULAR, false, false); verifyDataIndicators(TelephonyIcons.ICON_DATA_DISABLED, - TelephonyIcons.ICON_DATA_DISABLED); + TelephonyIcons.QS_ICON_DATA_DISABLED); } @Test @@ -148,7 +148,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { mNetworkController.handleConfigurationChanged(); verifyDataIndicators(TelephonyIcons.ICON_4G, - TelephonyIcons.ICON_4G); + TelephonyIcons.QS_DATA_4G); } @Test @@ -158,13 +158,13 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { TelephonyManager.NETWORK_TYPE_LTE); verifyDataIndicators(TelephonyIcons.ICON_LTE, - TelephonyIcons.ICON_LTE); + TelephonyIcons.QS_DATA_LTE); when(mServiceState.getDataNetworkType()) .thenReturn(TelephonyManager.NETWORK_TYPE_HSPA); updateServiceState(); verifyDataIndicators(TelephonyIcons.ICON_H, - TelephonyIcons.ICON_H); + TelephonyIcons.QS_DATA_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 aa62075530eb..1627925ae1bc 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.ICON_1X, false, false); + TelephonyIcons.QS_DATA_1X, false, false); } } -- cgit v1.2.3-59-g8ed1b