summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-07-24 12:16:14 -0400
committerJohn Spurlock <jspurlock@google.com>2014-07-24 12:16:14 -0400
commit2eec8fe5ebd14913a741d57327295e591c0736b8 (patch)
tree9b418fa7c4b6016ff2431cdf02b603de7f70d9e5
parent866cf65cc3c53f67836c9157d5c661adfdbd25e1 (diff)
downloadframeworks_base-2eec8fe5ebd14913a741d57327295e591c0736b8.zip
frameworks_base-2eec8fe5ebd14913a741d57327295e591c0736b8.tar.gz
frameworks_base-2eec8fe5ebd14913a741d57327295e591c0736b8.tar.bz2
QS: Fix clipped battery icon when expanded.
Change-Id: If5ad46b9f25e70af0e13654ce1137955eb87eec2
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
index 2f88e21..6db2e64 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
@@ -553,8 +553,9 @@ public class StatusBarHeaderView extends RelativeLayout implements View.OnClickL
}
public void update() {
- final boolean onKeyguardAndCollapsed = mKeyguardShowing && !mExpanded;
- mSystemIconsContainer.setClipBounds(onKeyguardAndCollapsed ? null : mClipBounds);
+ final boolean collapsedKeyguard = mKeyguardShowing && !mExpanded;
+ final boolean expanded = mExpanded && !mOverscrolled;
+ mSystemIconsContainer.setClipBounds(collapsedKeyguard || expanded ? null : mClipBounds);
}
}