Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58732a36 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove insets in QSDetail" into rvc-dev am: da525e98 am: 0f4e9dad... 

Merge "Remove insets in QSDetail" into rvc-dev am: da525e98 am: 0f4e9dad am: 37e94b7e am: d2cd42af

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

Change-Id: Ifce5b783393b79e95f84e91f448dbefc967efcba
parents 6357b402 d2cd42af

packages/SystemUI/src/com/android/systemui/qs/QSDetail.java

+0 −30
Original line number Diff line number Diff line
@@ -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<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) {

        mSwitchState = state;

        if (mAnimatingOpen) {