From 1c3b01d0f9aa259375a77a101f2e2168894460f2 Mon Sep 17 00:00:00 2001 From: Fabian Kozynski Date: Tue, 23 Jun 2020 09:44:25 -0400 Subject: [PATCH] Remove insets in QSDetail After the QSDetail was shifted below the StatusBar, remove the insets from the title. Test: manual with cutout Fixes: 159095807 Change-Id: I1ac665726273e4730b1cd2c7db9818d123b49ab4 --- .../src/com/android/systemui/qs/QSDetail.java | 30 ------------------- 1 file changed, 30 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSDetail.java b/packages/SystemUI/src/com/android/systemui/qs/QSDetail.java index ee3b499edfb7b..2be8a9704e1c7 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSDetail.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSDetail.java @@ -25,13 +25,10 @@ import android.content.Intent; import android.content.res.Configuration; import android.graphics.drawable.Animatable; import android.util.AttributeSet; -import android.util.Pair; import android.util.SparseArray; -import android.view.DisplayCutout; import android.view.View; import android.view.ViewGroup; import android.view.ViewStub; -import android.view.WindowInsets; import android.view.accessibility.AccessibilityEvent; import android.widget.ImageView; import android.widget.LinearLayout; @@ -46,7 +43,6 @@ import com.android.systemui.R; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.qs.DetailAdapter; import com.android.systemui.statusbar.CommandQueue; -import com.android.systemui.statusbar.phone.StatusBarWindowView; public class QSDetail extends LinearLayout { @@ -283,32 +279,6 @@ public class QSDetail extends LinearLayout { } } - @Override - public WindowInsets onApplyWindowInsets(WindowInsets insets) { - DisplayCutout cutout = insets.getDisplayCutout(); - - Pair padding = StatusBarWindowView.cornerCutoutMargins( - cutout, getDisplay()); - - if (padding == null) { - mQsDetailHeader.setPaddingRelative( - getResources().getDimensionPixelSize(R.dimen.qs_detail_header_padding), - getPaddingTop(), - getResources().getDimensionPixelSize(R.dimen.qs_detail_header_padding), - getPaddingBottom() - ); - } else { - mQsDetailHeader.setPadding( - padding.first, - getPaddingTop(), - padding.second, - getPaddingBottom() - ); - } - - return super.onApplyWindowInsets(insets); - } - private void handleToggleStateChanged(boolean state, boolean toggleEnabled) { mSwitchState = state; if (mAnimatingOpen) {