Merge "Remove insets in QSDetail" into rvc-dev

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<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) {