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

Merge "Add cutout support in QSDetail" into qt-qpr1-dev am: 79a42a6cf9

Browse Source 
Change-Id: I86e99aa262953f893d03a3ade41144d7177d8ddb
This commit is contained in:
Automerger Merge Worker
2020-02-19 19:50:00 +00:00
parent 905982888c 79a42a6cf9
commit 07dd2677e6
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,9 +25,12 @@ 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.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;
@@ -42,6 +45,7 @@ import com.android.systemui.SysUiServiceProvider;
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.PhoneStatusBarView;
public class QSDetail extends LinearLayout { public class QSDetail extends LinearLayout {
@@ -142,6 +146,25 @@ public class QSDetail extends LinearLayout {
} }
} }
@Override
public WindowInsets onApplyWindowInsets(WindowInsets insets) {
DisplayCutout cutout = insets.getDisplayCutout();
Pair<Integer, Integer> padding = PhoneStatusBarView.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 updateDetailText() { private void updateDetailText() {
mDetailDoneButton.setText(R.string.quick_settings_done); mDetailDoneButton.setText(R.string.quick_settings_done);
mDetailSettingsButton.setText(R.string.quick_settings_more_settings); mDetailSettingsButton.setText(R.string.quick_settings_more_settings);