Merge "Use Wi-Fi content description in StatusBarWifiView" into pi-dev

am: 057698e511

Change-Id: Ibe278a8d5830b7345de40feda17390e09d3dab20
This commit is contained in:
android-build-team Robot
2018-05-02 12:47:11 -07:00
committed by android-build-merger

View File

@@ -191,6 +191,7 @@ public class StatusBarWifiView extends FrameLayout implements DarkReceiver,
}
private void updateState(WifiIconState state) {
setContentDescription(state.contentDescription);
if (mState.resId != state.resId && state.resId >= 0) {
NeutralGoodDrawable drawable = NeutralGoodDrawable
.create(mLightContext, mDarkContext, state.resId);
@@ -212,6 +213,7 @@ public class StatusBarWifiView extends FrameLayout implements DarkReceiver,
}
private void initViewState() {
setContentDescription(mState.contentDescription);
if (mState.resId >= 0) {
NeutralGoodDrawable drawable = NeutralGoodDrawable.create(
mLightContext, mDarkContext, mState.resId);