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

am d92f55cb: Merge "Shade: Hide status icons, take 2." into lmp-dev

Browse Source 
* commit 'd92f55cb1169c51858152b9787ba5d3e685ae86b':
  Shade: Hide status icons, take 2.
This commit is contained in:
John Spurlock
2014-07-17 23:15:32 +00:00
committed by Android Git Automerger
parent b658954467 c2d09dd746
commit 92e2fa75be
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
View File

@@ -285,6 +285,9 @@ public class StatusBarHeaderView extends RelativeLayout implements View.OnClickL
mDateExpanded.setVisibility(mExpanded && !mOverscrolled ? View.VISIBLE : View.GONE);
mSettingsButton.setVisibility(mExpanded && !mOverscrolled ? View.VISIBLE : View.GONE);
mQsDetailHeader.setVisibility(mExpanded ? View.VISIBLE : View.GONE);
if (mStatusIcons != null) {
mStatusIcons.setVisibility(!mExpanded || mOverscrolled ? View.VISIBLE : View.GONE);
}
if (mSignalCluster != null) {
mSignalCluster.setVisibility(!mExpanded || mOverscrolled ? View.VISIBLE : View.GONE);
}
@@ -437,15 +440,16 @@ public class StatusBarHeaderView extends RelativeLayout implements View.OnClickL
public void attachSystemIcons(LinearLayout systemIcons) {
mSystemIconsContainer.addView(systemIcons);
mStatusIcons = systemIcons.findViewById(R.id.statusIcons);
mStatusIcons.addOnLayoutChangeListener(mStatusIconsChanged);
mSignalCluster = systemIcons.findViewById(R.id.signal_cluster);
mSignalCluster.addOnLayoutChangeListener(mSignalClusterChanged);
}
public void onSystemIconsDetached() {
if (mStatusIcons != null) {
mStatusIcons.removeOnLayoutChangeListener(mStatusIconsChanged);
mStatusIcons.setVisibility(View.VISIBLE);
}
if (mSignalCluster != null) {
mSignalCluster.removeOnLayoutChangeListener(mSignalClusterChanged);
mSignalCluster.setVisibility(View.VISIBLE);
}
mStatusIcons = null;
@@ -528,7 +532,7 @@ public class StatusBarHeaderView extends RelativeLayout implements View.OnClickL
// here.
}
private final OnLayoutChangeListener mStatusIconsChanged = new OnLayoutChangeListener() {
private final OnLayoutChangeListener mSignalClusterChanged = new OnLayoutChangeListener() {
private final Rect mClipBounds = new Rect();
@Override
@@ -536,12 +540,9 @@ public class StatusBarHeaderView extends RelativeLayout implements View.OnClickL
int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
// Hide the statusIcons in the header by clipping them. Can't touch visibility since
// they are mirrored to the real status bar.
final Rect r = mSystemIconsContainer.getClipBounds();
if (r == null || r.left != right) {
mClipBounds.set(right, 0, mSystemIconsContainer.getWidth(),
mSystemIconsContainer.getHeight());
mSystemIconsContainer.setClipBounds(mClipBounds);
}
mClipBounds.set(left, 0, mSystemIconsContainer.getWidth(),
mSystemIconsContainer.getHeight());
mSystemIconsContainer.setClipBounds(mClipBounds);
}
};