Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix QS wifi scan state" into oc-dr1-dev

Browse Source
This commit is contained in:
Jason Monk
2017-08-01 16:41:43 +00:00
committed by Android (Google) Code Review
parent f3562ffdfb d9fcc641e9
commit ce099ba8bc
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/qs/QSDetail.java
View File

@@ -287,11 +287,17 @@ public class QSDetail extends LinearLayout {
mScanState = state;
final Animatable anim = (Animatable) mQsDetailHeaderProgress.getDrawable();
if (state) {
mQsDetailHeaderProgress.animate().alpha(1f);
anim.start();
mQsDetailHeaderProgress.animate().cancel();
mQsDetailHeaderProgress.animate()
.alpha(1)
.withEndAction(anim::start)
.start();
} else {
mQsDetailHeaderProgress.animate().alpha(0f);
anim.stop();
mQsDetailHeaderProgress.animate().cancel();
mQsDetailHeaderProgress.animate()
.alpha(0f)
.withEndAction(anim::stop)
.start();
}
}

9
packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
View File

@@ -328,9 +328,6 @@ public class WifiTile extends QSTileImpl<SignalState> {
filterUnreachableAPs();
updateItems();
if (accessPoints != null && accessPoints.size() > 0) {
fireScanStateChanged(false);
}
}
/** Filter unreachable APs from mAccessPoints */
@@ -378,6 +375,12 @@ public class WifiTile extends QSTileImpl<SignalState> {
private void updateItems() {
if (mItems == null) return;
if ((mAccessPoints != null && mAccessPoints.length > 0)
|| !mSignalCallback.mInfo.enabled) {
fireScanStateChanged(false);
} else {
fireScanStateChanged(true);
}
// Wi-Fi is off
if (!mSignalCallback.mInfo.enabled) {