From 32d65de541206356628cea999482b0f509178bfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A1n=20Casta=C3=B1=C3=B3n=20=C3=81lvarez?= Date: Sat, 10 Aug 2019 03:45:43 +0200 Subject: [aospa][quartz] SystemUI: Hide ringer button if alert slider is present Change-Id: Ia0b3b095eed35b87bd81e2f96622391949f5b721 --- .../SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java index 0d80afdee99e..7aee1a7f92ae 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java @@ -61,6 +61,7 @@ import android.os.VibrationEffect; import android.provider.Settings; import android.provider.Settings.Global; import android.text.InputFilter; +import android.text.TextUtils; import android.util.Log; import android.util.Slog; import android.util.SparseBooleanArray; @@ -164,6 +165,7 @@ public class VolumeDialogImpl implements VolumeDialog, private boolean mHasSeenODICaptionsTooltip; private ViewStub mODICaptionsTooltipViewStub; private View mODICaptionsTooltipView = null; + private boolean mHasAlertSlider; public VolumeDialogImpl(Context context) { mContext = @@ -176,6 +178,7 @@ public class VolumeDialogImpl implements VolumeDialog, mShowActiveStreamOnly = showActiveStreamOnly(); mHasSeenODICaptionsTooltip = Prefs.getBoolean(context, Prefs.Key.HAS_SEEN_ODI_CAPTIONS_TOOLTIP, false); + mHasAlertSlider = mContext.getResources().getBoolean(com.android.internal.R.bool.config_hasAlertSlider); } @Override @@ -274,6 +277,9 @@ public class VolumeDialogImpl implements VolumeDialog, mDialogView.removeView(mODICaptionsTooltipViewStub); mODICaptionsTooltipViewStub = null; } + if (mHasAlertSlider) { + mRinger.setVisibility(View.GONE); + } mSettingsView = mDialog.findViewById(R.id.settings_container); mSettingsIcon = mDialog.findViewById(R.id.settings); -- cgit v1.2.3