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

Merge "Remove panel paddings/margins when QS is customizing" into nyc-dev

Browse Source
This commit is contained in:
Jason Monk
2016-03-31 15:43:45 +00:00
committed by Android (Google) Code Review
parent 26350a4276 428914d0f0
commit 33b30609ff
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java
View File

@@ -125,6 +125,7 @@ public class QSCustomizer extends LinearLayout implements OnMenuItemClickListene
mClipper.animateCircularClip(x, y, true, mExpandAnimationListener);
new TileQueryHelper(mContext, mHost).setListener(mTileAdapter);
mNotifQsContainer.setCustomizerAnimating(true);
mNotifQsContainer.setCustomizerShowing(true);
}
}
@@ -137,6 +138,7 @@ public class QSCustomizer extends LinearLayout implements OnMenuItemClickListene
save();
mClipper.animateCircularClip(x, y, false, mCollapseAnimationListener);
mNotifQsContainer.setCustomizerAnimating(true);
mNotifQsContainer.setCustomizerShowing(false);
}
}

26
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java
View File

@@ -35,6 +35,7 @@ import com.android.systemui.qs.customize.QSCustomizer;
public class NotificationsQuickSettingsContainer extends FrameLayout
implements ViewStub.OnInflateListener, DensityContainer.InflateListener {
private DensityContainer mQsContainer;
private View mUserSwitcher;
private View mStackScroller;
@@ -43,6 +44,9 @@ public class NotificationsQuickSettingsContainer extends FrameLayout
private boolean mQsExpanded;
private boolean mCustomizerAnimating;
private int mBottomPadding;
private int mStackScrollerMargin;
public NotificationsQuickSettingsContainer(Context context, AttributeSet attrs) {
super(context, attrs);
}
@@ -53,6 +57,7 @@ public class NotificationsQuickSettingsContainer extends FrameLayout
mQsContainer = (DensityContainer) findViewById(R.id.qs_density_container);
mQsContainer.addInflateListener(this);
mStackScroller = findViewById(R.id.notification_stack_scroller);
mStackScrollerMargin = ((LayoutParams) mStackScroller.getLayoutParams()).bottomMargin;
mKeyguardStatusBar = findViewById(R.id.keyguard_header);
ViewStub userSwitcher = (ViewStub) findViewById(R.id.keyguard_user_switcher);
userSwitcher.setOnInflateListener(this);
@@ -75,7 +80,8 @@ public class NotificationsQuickSettingsContainer extends FrameLayout
@Override
public WindowInsets onApplyWindowInsets(WindowInsets insets) {
setPadding(0, 0, 0, insets.getStableInsetBottom());
mBottomPadding = insets.getStableInsetBottom();
setPadding(0, 0, 0, mBottomPadding);
return insets;
}
@@ -141,4 +147,22 @@ public class NotificationsQuickSettingsContainer extends FrameLayout
invalidate();
}
}
public void setCustomizerShowing(boolean isShowing) {
if (isShowing) {
// Clear out bottom paddings/margins so the qs customization can be full height.
setPadding(0, 0, 0, 0);
setBottomMargin(mStackScroller, 0);
} else {
setPadding(0, 0, 0, mBottomPadding);
setBottomMargin(mStackScroller, mStackScrollerMargin);
}
}
private void setBottomMargin(View v, int bottomMargin) {
LayoutParams params = (LayoutParams) v.getLayoutParams();
params.bottomMargin = bottomMargin;
v.setLayoutParams(params);
}
}