diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_no_sim.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_no_sim.png deleted file mode 100644 index 5ce8708db094a..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_no_sim.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_no_sim.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_no_sim.png deleted file mode 100644 index bdf0f67d546e4..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_no_sim.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_no_sim.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_no_sim.png deleted file mode 100644 index 461535cc24f34..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_no_sim.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_no_sim.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_no_sim.png deleted file mode 100644 index 7b03a11d1acf2..0000000000000 Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_no_sim.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable/ic_qs_location_01.xml b/packages/SystemUI/res/drawable/ic_notify_zen.xml similarity index 61% rename from packages/SystemUI/res/drawable/ic_qs_location_01.xml rename to packages/SystemUI/res/drawable/ic_notify_zen.xml index ff37d9a82e1f7..c46455b3f7aee 100644 --- a/packages/SystemUI/res/drawable/ic_qs_location_01.xml +++ b/packages/SystemUI/res/drawable/ic_notify_zen.xml @@ -15,14 +15,14 @@ Copyright (C) 2014 The Android Open Source Project --> + android:width="24dp" + android:height="24dp"/> + android:viewportWidth="48.0" + android:viewportHeight="48.0"/> + android:pathData="M4.0,24.0c0.0,11.0 9.0,20.0 20.0,20.0s20.0,-9.0 20.0,-20.0S35.0,4.0 24.0,4.0S4.0,13.0 4.0,24.0zM36.6,33.8L14.2,11.4C16.9,9.3 20.3,8.0 24.0,8.0c8.8,0.0 16.0,7.2 16.0,16.0C40.0,27.7 38.7,31.1 36.6,33.8zM8.0,24.0c0.0,-3.7 1.3,-7.1 3.4,-9.8L33.8,36.6C31.1,38.7 27.7,40.0 24.0,40.0C15.2,40.0 8.0,32.8 8.0,24.0z"/> diff --git a/packages/SystemUI/res/drawable/ic_qs_color_inversion.xml b/packages/SystemUI/res/drawable/ic_qs_color_inversion.xml deleted file mode 100644 index dc30a53de1159..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_color_inversion.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - diff --git a/packages/SystemUI/res/drawable/ic_qs_location_02.xml b/packages/SystemUI/res/drawable/ic_qs_inversion_off.xml similarity index 59% rename from packages/SystemUI/res/drawable/ic_qs_location_02.xml rename to packages/SystemUI/res/drawable/ic_qs_inversion_off.xml index bb4465f36cf5b..b6a5cadfe0c82 100644 --- a/packages/SystemUI/res/drawable/ic_qs_location_02.xml +++ b/packages/SystemUI/res/drawable/ic_qs_inversion_off.xml @@ -19,10 +19,10 @@ Copyright (C) 2014 The Android Open Source Project android:height="64dp"/> + android:viewportWidth="48.0" + android:viewportHeight="48.0"/> + android:fill="#4DFFFFFF" + android:pathData="M41.3,41.7L36.6,37.0L24.0,24.5l-7.1,-7.1L14.0,14.5L8.5,9.0L6.0,11.5l5.6,5.6c-5.1,6.3 -4.7,15.5 1.1,21.4c3.1,3.1 7.2,4.7 11.3,4.7c3.6,0.0 7.1,-1.2 10.1,-3.6l5.4,5.4l2.5,-2.5L41.3,41.7zM24.0,39.2c-3.2,0.0 -6.2,-1.2 -8.5,-3.5c-2.3,-2.3 -3.5,-5.3 -3.5,-8.5c0.0,-2.6 0.9,-5.1 2.4,-7.2l9.6,9.6L24.0,39.2zM24.0,10.2l0.0,9.2l14.5,14.5c2.7,-5.9 1.7,-13.1 -3.2,-18.0L24.0,4.5l0.0,0.0l0.0,0.0L16.6,12.0l2.8,2.8L24.0,10.2z"/> diff --git a/packages/SystemUI/res/drawable/ic_qs_location_04.xml b/packages/SystemUI/res/drawable/ic_qs_inversion_on.xml similarity index 69% rename from packages/SystemUI/res/drawable/ic_qs_location_04.xml rename to packages/SystemUI/res/drawable/ic_qs_inversion_on.xml index 0c0fb3b87e93a..e8d59e0dad9d8 100644 --- a/packages/SystemUI/res/drawable/ic_qs_location_04.xml +++ b/packages/SystemUI/res/drawable/ic_qs_inversion_on.xml @@ -19,10 +19,10 @@ Copyright (C) 2014 The Android Open Source Project android:height="64dp"/> + android:viewportWidth="48.0" + android:viewportHeight="48.0"/> + android:pathData="M35.3,15.9L24.0,4.5l0.0,0.0l0.0,0.0L12.7,15.9c-6.2,6.2 -6.2,16.4 0.0,22.6c3.1,3.1 7.2,4.7 11.3,4.7s8.2,-1.6 11.3,-4.7C41.6,32.2 41.6,22.1 35.3,15.9zM24.0,39.2L24.0,39.2c-3.2,0.0 -6.2,-1.2 -8.5,-3.5c-2.3,-2.3 -3.5,-5.3 -3.5,-8.5s1.2,-6.2 3.5,-8.5l8.5,-8.5L24.0,39.2z"/> diff --git a/packages/SystemUI/res/drawable/ic_qs_location_03.xml b/packages/SystemUI/res/drawable/ic_qs_location_03.xml deleted file mode 100644 index 956a8c348a9dd..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_location_03.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - diff --git a/packages/SystemUI/res/drawable/ic_qs_location_05.xml b/packages/SystemUI/res/drawable/ic_qs_location_05.xml deleted file mode 100644 index 1a21e2f1cc6e1..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_location_05.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - diff --git a/packages/SystemUI/res/drawable/ic_qs_location_06.xml b/packages/SystemUI/res/drawable/ic_qs_location_06.xml deleted file mode 100644 index 5642a8a2a7e7f..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_location_06.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - diff --git a/packages/SystemUI/res/drawable/ic_qs_location_07.xml b/packages/SystemUI/res/drawable/ic_qs_location_07.xml deleted file mode 100644 index 1ad2ebc7fddab..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_location_07.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - diff --git a/packages/SystemUI/res/drawable/ic_qs_location_08.xml b/packages/SystemUI/res/drawable/ic_qs_location_08.xml deleted file mode 100644 index 179bc6646741b..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_location_08.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - diff --git a/packages/SystemUI/res/drawable/ic_qs_location_09.xml b/packages/SystemUI/res/drawable/ic_qs_location_09.xml deleted file mode 100644 index 6169af57c5f91..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_location_09.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - diff --git a/packages/SystemUI/res/drawable/ic_qs_location_10.xml b/packages/SystemUI/res/drawable/ic_qs_location_10.xml deleted file mode 100644 index 93e2eb46b0501..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_location_10.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - diff --git a/packages/SystemUI/res/drawable/ic_qs_location_off.xml b/packages/SystemUI/res/drawable/ic_qs_location_off.xml index d28d3475218ae..26ebfbf050b18 100644 --- a/packages/SystemUI/res/drawable/ic_qs_location_off.xml +++ b/packages/SystemUI/res/drawable/ic_qs_location_off.xml @@ -1,4 +1,3 @@ - - - - - - - - - - - - - - + + + + + + + + diff --git a/packages/SystemUI/res/drawable/ic_qs_location_on.xml b/packages/SystemUI/res/drawable/ic_qs_location_on.xml index 72512ac48fcef..bc73005ff8913 100644 --- a/packages/SystemUI/res/drawable/ic_qs_location_on.xml +++ b/packages/SystemUI/res/drawable/ic_qs_location_on.xml @@ -1,4 +1,3 @@ - - - - - - - - - - - - - - + + + + + + + diff --git a/packages/SystemUI/res/drawable/ic_qs_location_11.xml b/packages/SystemUI/res/drawable/stat_sys_no_sim.xml similarity index 71% rename from packages/SystemUI/res/drawable/ic_qs_location_11.xml rename to packages/SystemUI/res/drawable/stat_sys_no_sim.xml index 09a3e630bc95f..70948b7f4d5f4 100644 --- a/packages/SystemUI/res/drawable/ic_qs_location_11.xml +++ b/packages/SystemUI/res/drawable/stat_sys_no_sim.xml @@ -15,14 +15,14 @@ Copyright (C) 2014 The Android Open Source Project --> + android:width="18dp" + android:height="18dp"/> + android:fill="#4DFFFFFF" + android:pathData="M19.0,5.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0l-7.0,0.0L7.7,5.3L19.0,16.7L19.0,5.0zM3.7,3.9L2.4,5.2L5.0,7.8L5.0,19.0c0.0,1.1 0.9,2.0 2.0,2.0l10.0,0.0c0.4,0.0 0.7,-0.1 1.0,-0.3l1.9,1.9l1.3,-1.3L3.7,3.9z"/> diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java index c76ee8c9f6559..786cd9ec12ed3 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java @@ -287,6 +287,7 @@ public abstract class QSTile implements Listenable { public boolean activityIn; public boolean activityOut; public int overlayIconId; + public boolean filter; @Override public boolean copyTo(State other) { @@ -300,6 +301,7 @@ public abstract class QSTile implements Listenable { o.activityIn = activityIn; o.activityOut = activityOut; o.overlayIconId = overlayIconId; + o.filter = filter; return super.copyTo(other) || changed; } @@ -311,6 +313,7 @@ public abstract class QSTile implements Listenable { rt.insert(rt.length() - 1, ",activityIn=" + activityIn); rt.insert(rt.length() - 1, ",activityOut=" + activityOut); rt.insert(rt.length() - 1, ",overlayIconId=" + overlayIconId); + rt.insert(rt.length() - 1, ",filter=" + filter); return rt; } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java b/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java index 901cc104702e6..d5fe033db88cd 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java @@ -93,12 +93,12 @@ public final class SignalTileView extends QSTileView { final SignalState s = (SignalState) state; mSignal.setImageDrawable(null); // force refresh mSignal.setImageResource(s.iconId); - mSignal.setColorFilter(FILTER); + mSignal.setColorFilter(s.filter ? FILTER : null); if (s.overlayIconId > 0) { mOverlay.setVisibility(VISIBLE); mOverlay.setImageDrawable(null); // force refresh mOverlay.setImageResource(s.overlayIconId); - mOverlay.setColorFilter(FILTER); + mOverlay.setColorFilter(s.filter ? FILTER : null); } else { mOverlay.setVisibility(GONE); } 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 182a0ced30453..6d91d33f5f800 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java @@ -72,12 +72,15 @@ public class CellularTile extends QSTile { if (cb == null) return; final Resources r = mContext.getResources(); - state.iconId = cb.enabled && (cb.mobileSignalIconId > 0) + state.iconId = cb.noSim + ? R.drawable.stat_sys_no_sim + : cb.enabled && (cb.mobileSignalIconId > 0) ? cb.mobileSignalIconId : R.drawable.ic_qs_signal_no_signal; state.overlayIconId = cb.enabled && (cb.dataTypeIconId > 0) && !cb.wifiEnabled ? cb.dataTypeIconId : 0; + state.filter = state.iconId != R.drawable.stat_sys_no_sim; state.activityIn = cb.enabled && cb.activityIn; state.activityOut = cb.enabled && cb.activityOut; @@ -117,6 +120,7 @@ public class CellularTile extends QSTile { boolean activityIn; boolean activityOut; String enabledDesc; + boolean noSim; } private final NetworkSignalChangedCallback mCallback = new NetworkSignalChangedCallback() { @@ -134,7 +138,7 @@ public class CellularTile extends QSTile { int mobileSignalIconId, String mobileSignalContentDescriptionId, int dataTypeIconId, boolean activityIn, boolean activityOut, - String dataTypeContentDescriptionId, String description) { + String dataTypeContentDescriptionId, String description, boolean noSim) { final CallbackInfo info = new CallbackInfo(); // TODO pool? info.enabled = enabled; info.wifiEnabled = mWifiEnabled; @@ -145,6 +149,7 @@ public class CellularTile extends QSTile { info.activityIn = activityIn; info.activityOut = activityOut; info.enabledDesc = description; + info.noSim = noSim; refreshState(info); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java index 53013622d8c92..7c2c7c301bbf3 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java @@ -71,6 +71,6 @@ public class ColorInversionTile extends QSTile { state.visible = mVisible; state.value = enabled; state.label = mContext.getString(R.string.quick_settings_inversion_label); - state.iconId = R.drawable.ic_qs_color_inversion; + state.iconId = enabled ? R.drawable.ic_qs_inversion_on : R.drawable.ic_qs_inversion_off; } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java index db9b0547f8ba1..04f1eb5359a64 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java @@ -16,9 +16,6 @@ package com.android.systemui.qs.tiles; -import android.content.res.Resources; -import android.graphics.drawable.AnimationDrawable; - import com.android.systemui.R; import com.android.systemui.qs.QSTile; import com.android.systemui.statusbar.policy.LocationController; @@ -63,28 +60,15 @@ public class LocationTile extends QSTile { protected void handleUpdateState(BooleanState state, Object arg) { final boolean locationEnabled = mController.isLocationEnabled(); state.visible = true; - if (state.value != locationEnabled) { - state.value = locationEnabled; - final Resources res = mContext.getResources(); - final AnimationDrawable d = (AnimationDrawable) res.getDrawable(locationEnabled - ? R.drawable.ic_qs_location_on - : R.drawable.ic_qs_location_off); - state.icon = d; - mUiHandler.post(new Runnable() { - @Override - public void run() { - d.start(); - } - }); - } + state.value = locationEnabled; if (locationEnabled) { - if (state.icon == null) state.iconId = R.drawable.ic_qs_location_01; + state.iconId = R.drawable.ic_qs_location_on; state.label = mContext.getString(R.string.quick_settings_location_label); state.contentDescription = mContext.getString( R.string.accessibility_quick_settings_location, mContext.getString(R.string.accessibility_desc_on)); } else { - if (state.icon == null) state.iconId = R.drawable.ic_qs_location_11; + state.iconId = R.drawable.ic_qs_location_off; state.label = mContext.getString(R.string.quick_settings_location_label); state.contentDescription = mContext.getString( R.string.accessibility_quick_settings_location, diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java index 6b73002375bc2..a2364973fd413 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java @@ -87,6 +87,7 @@ public class WifiTile extends QSTile { state.connected = wifiConnected; state.activityIn = cb.enabled && cb.activityIn; state.activityOut = cb.enabled && cb.activityOut; + state.filter = true; final String signalContentDescription; final Resources r = mContext.getResources(); if (wifiConnected) { @@ -159,7 +160,7 @@ public class WifiTile extends QSTile { int mobileSignalIconId, String mobileSignalContentDescriptionId, int dataTypeIconId, boolean activityIn, boolean activityOut, - String dataTypeContentDescriptionId, String description) { + String dataTypeContentDescriptionId, String description, boolean noSim) { // noop } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/InterceptedNotifications.java b/packages/SystemUI/src/com/android/systemui/statusbar/InterceptedNotifications.java index 4233ab8c300d0..f0a7a4c85cbab 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/InterceptedNotifications.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/InterceptedNotifications.java @@ -111,7 +111,7 @@ public class InterceptedNotifications { return; } final Notification n = new Notification.Builder(mContext) - .setSmallIcon(R.drawable.ic_qs_zen_on) + .setSmallIcon(R.drawable.ic_notify_zen) .setContentTitle(mContext.getResources().getQuantityString( R.plurals.zen_mode_notification_title, mIntercepted.size(), mIntercepted.size())) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java index dc8f315b9713e..1f6886055d921 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java @@ -30,7 +30,7 @@ public interface NetworkController { void onMobileDataSignalChanged(boolean enabled, int mobileSignalIconId, String mobileSignalContentDescriptionId, int dataTypeIconId, boolean activityIn, boolean activityOut, - String dataTypeContentDescriptionId, String description); + String dataTypeContentDescriptionId, String description, boolean noSim); void onAirplaneModeChanged(boolean enabled); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java index 56402a5d9b8e0..254a0e8453bf1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java @@ -87,6 +87,7 @@ public class NetworkControllerImpl extends BroadcastReceiver int mQSDataTypeIconId; int mAirplaneIconId; boolean mDataActive; + boolean mNoSim; int mLastSignalLevel; boolean mShowPhoneRSSIForData = false; boolean mShowAtLeastThreeGees = false; @@ -349,18 +350,18 @@ public class NetworkControllerImpl extends BroadcastReceiver if (isEmergencyOnly()) { cb.onMobileDataSignalChanged(false, mQSPhoneSignalIconId, mContentDescriptionPhoneSignal, mQSDataTypeIconId, mobileIn, mobileOut, - mContentDescriptionDataType, null); + mContentDescriptionDataType, null, mNoSim); } else { if (mIsWimaxEnabled && mWimaxConnected) { // Wimax is special cb.onMobileDataSignalChanged(true, mQSPhoneSignalIconId, mContentDescriptionPhoneSignal, mQSDataTypeIconId, mobileIn, mobileOut, - mContentDescriptionDataType, mNetworkName); + mContentDescriptionDataType, mNetworkName, mNoSim); } else { // Normal mobile data cb.onMobileDataSignalChanged(mHasMobileDataFeature, mQSPhoneSignalIconId, mContentDescriptionPhoneSignal, mQSDataTypeIconId, mobileIn, mobileOut, - mContentDescriptionDataType, mNetworkName); + mContentDescriptionDataType, mNetworkName, mNoSim); } } cb.onAirplaneModeChanged(mAirplaneMode); @@ -736,6 +737,7 @@ public class NetworkControllerImpl extends BroadcastReceiver // GSM case, we have to check also the sim state if (mSimState == IccCardConstants.State.READY || mSimState == IccCardConstants.State.UNKNOWN) { + mNoSim = false; if (hasService() && mDataState == TelephonyManager.DATA_CONNECTED) { switch (mDataActivity) { case TelephonyManager.DATA_ACTIVITY_IN: @@ -758,6 +760,7 @@ public class NetworkControllerImpl extends BroadcastReceiver } } else { iconId = R.drawable.stat_sys_no_sim; + mNoSim = true; visible = false; // no SIM? no data } } else {