Merge "SystemUI: Fix data activity overlay not being removed when data is disabled"

dsandler · android code review · commit ad955fe87f44 · 2012-08-28T12:52:49.000-07:00
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
@@ -976,6 +976,8 @@ void refreshViews() {
                 combinedActivityIconId = mMobileActivityIconId;
                 combinedSignalIconId = mDataSignalIconId; // set by updateDataIcon()
                 mContentDescriptionCombinedSignal = mContentDescriptionDataType;
+            } else {
+                mMobileActivityIconId = 0;
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -976,6 +976,8 @@ void refreshViews() {`
`976`	`976`	`combinedActivityIconId = mMobileActivityIconId;`
`977`	`977`	`combinedSignalIconId = mDataSignalIconId; // set by updateDataIcon()`
`978`	`978`	`mContentDescriptionCombinedSignal = mContentDescriptionDataType;`
	`979`	`+ } else {`
	`980`	`+ mMobileActivityIconId = 0;`
`979`	`981`	`}`
`980`	`982`	`}`
`981`	`983`