split shade: exclude cutout overlay

This commit is contained in:
elpaablo 2024-08-14 10:46:25 +01:00
parent 4030c59967
commit 25d4e24e39

View file

@ -67,9 +67,9 @@ public class QuickSettings extends SettingsPreferenceFragment implements
private static final String QS_SPLIT_SHADE_LAYOUT_CTG = "android.theme.customization.qs_landscape_layout";
private static final String QS_SPLIT_SHADE_LAYOUT_PKG = "com.android.systemui.qs.landscape.split_shade_layout";
private static final String QS_SPLIT_SHADE_LAYOUT_TARGET = "com.android.systemui";
private static final String QS_SPLIT_SHADE_CUTOUT_CTG = "android.theme.customization.qs_landscape_cutout";
private static final String QS_SPLIT_SHADE_CUTOUT_PKG = "android.landscape.split_shade_cutout";
private static final String QS_SPLIT_SHADE_CUTOUT_TARGET = "android";
// private static final String QS_SPLIT_SHADE_CUTOUT_CTG = "android.theme.customization.qs_landscape_cutout";
// private static final String QS_SPLIT_SHADE_CUTOUT_PKG = "android.landscape.split_shade_cutout";
// private static final String QS_SPLIT_SHADE_CUTOUT_TARGET = "android";
private ListPreference mShowBrightnessSlider;
private ListPreference mBrightnessSliderPosition;
@ -154,8 +154,8 @@ public class QuickSettings extends SettingsPreferenceFragment implements
}
private boolean isSplitShadeEnabled() {
return mThemeUtils.isOverlayEnabled(QS_SPLIT_SHADE_LAYOUT_PKG)
&& mThemeUtils.isOverlayEnabled(QS_SPLIT_SHADE_CUTOUT_PKG);
return mThemeUtils.isOverlayEnabled(QS_SPLIT_SHADE_LAYOUT_PKG);
// && mThemeUtils.isOverlayEnabled(QS_SPLIT_SHADE_CUTOUT_PKG);
}
private void updateSplitShadeState(boolean enable) {
@ -165,10 +165,10 @@ public class QuickSettings extends SettingsPreferenceFragment implements
enable ? QS_SPLIT_SHADE_LAYOUT_PKG : QS_SPLIT_SHADE_LAYOUT_TARGET,
QS_SPLIT_SHADE_LAYOUT_TARGET);
mThemeUtils.setOverlayEnabled(
/*mThemeUtils.setOverlayEnabled(
QS_SPLIT_SHADE_CUTOUT_CTG,
enable ? QS_SPLIT_SHADE_CUTOUT_PKG : QS_SPLIT_SHADE_CUTOUT_TARGET,
QS_SPLIT_SHADE_CUTOUT_TARGET);
QS_SPLIT_SHADE_CUTOUT_TARGET);*/
}
public static void reset(Context mContext) {
@ -216,8 +216,8 @@ public class QuickSettings extends SettingsPreferenceFragment implements
QsHeaderImageSettings.reset(mContext);
ResourceUtils.updateOverlay(mContext, QS_SPLIT_SHADE_LAYOUT_CTG, QS_SPLIT_SHADE_LAYOUT_TARGET,
QS_SPLIT_SHADE_LAYOUT_TARGET);
ResourceUtils.updateOverlay(mContext, QS_SPLIT_SHADE_CUTOUT_CTG, QS_SPLIT_SHADE_CUTOUT_TARGET,
QS_SPLIT_SHADE_CUTOUT_TARGET);
//ResourceUtils.updateOverlay(mContext, QS_SPLIT_SHADE_CUTOUT_CTG, QS_SPLIT_SHADE_CUTOUT_TARGET,
// QS_SPLIT_SHADE_CUTOUT_TARGET);
}
private void updateAnimTileStyle(int tileAnimationStyle) {