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

Merge "Properly collapse QQS header when QQS is disabled" into rvc-dev am: 7566f6d34c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11855703

Change-Id: I0b56a316e16bcf040729266b3203b46021047d2e
This commit is contained in:
TreeHugger Robot
2020-06-15 17:17:26 +00:00
committed by Automerger Merge Worker
parent 108e9b1afa 7566f6d34c
commit a18067e74f
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
View File

@@ -15,6 +15,7 @@
package com.android.systemui.qs; package com.android.systemui.qs;
import static android.app.StatusBarManager.DISABLE2_QUICK_SETTINGS; import static android.app.StatusBarManager.DISABLE2_QUICK_SETTINGS;
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
import static com.android.systemui.util.InjectionInflationController.VIEW_CONTEXT; import static com.android.systemui.util.InjectionInflationController.VIEW_CONTEXT;
@@ -41,6 +42,7 @@ import android.util.Pair;
import android.view.ContextThemeWrapper; import android.view.ContextThemeWrapper;
import android.view.DisplayCutout; import android.view.DisplayCutout;
import android.view.View; import android.view.View;
import android.view.ViewGroup;
import android.view.WindowInsets; import android.view.WindowInsets;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
@@ -347,6 +349,15 @@ public class QuickStatusBarHeader extends RelativeLayout implements
com.android.internal.R.dimen.quick_qs_offset_height); com.android.internal.R.dimen.quick_qs_offset_height);
mSystemIconsView.setLayoutParams(mSystemIconsView.getLayoutParams()); mSystemIconsView.setLayoutParams(mSystemIconsView.getLayoutParams());
ViewGroup.LayoutParams lp = getLayoutParams();
if (mQsDisabled) {
lp.height = resources.getDimensionPixelSize(
com.android.internal.R.dimen.quick_qs_offset_height);
} else {
lp.height = WRAP_CONTENT;
}
setLayoutParams(lp);
updateStatusIconAlphaAnimator(); updateStatusIconAlphaAnimator();
updateHeaderTextContainerAlphaAnimator(); updateHeaderTextContainerAlphaAnimator();
} }