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

Merge "Remove insets in QSDetail" into rvc-dev am: da525e98d5 am: 0f4e9dad33

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

Change-Id: I91a41e1c8242a3232d4b954d87648fd53d1fc6f7
This commit is contained in:
TreeHugger Robot
2020-06-23 18:52:50 +00:00
committed by Automerger Merge Worker
parent 1ec65ac763 0f4e9dad33
commit 37e94b7e01
1 changed files with 0 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
packages/SystemUI/src/com/android/systemui/qs/QSDetail.java
View File

@@ -25,13 +25,10 @@ import android.content.Intent;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.graphics.drawable.Animatable; import android.graphics.drawable.Animatable;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Pair;
import android.util.SparseArray; import android.util.SparseArray;
import android.view.DisplayCutout;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.ViewStub; import android.view.ViewStub;
import android.view.WindowInsets;
import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityEvent;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
@@ -46,7 +43,6 @@ import com.android.systemui.R;
import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.ActivityStarter;
import com.android.systemui.plugins.qs.DetailAdapter; import com.android.systemui.plugins.qs.DetailAdapter;
import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.CommandQueue;
import com.android.systemui.statusbar.phone.StatusBarWindowView;
public class QSDetail extends LinearLayout { 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<Integer, Integer> 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) { private void handleToggleStateChanged(boolean state, boolean toggleEnabled) {
mSwitchState = state; mSwitchState = state;
if (mAnimatingOpen) { if (mAnimatingOpen) {