diff --git a/packages/SystemUI/res/drawable/brightness_progress_drawable.xml b/packages/SystemUI/res/drawable/brightness_progress_drawable.xml index 45d8dc1093307..73b02f4fa481f 100644 --- a/packages/SystemUI/res/drawable/brightness_progress_drawable.xml +++ b/packages/SystemUI/res/drawable/brightness_progress_drawable.xml @@ -1,37 +1,37 @@ - - + + - - - - - + android:gravity="center_vertical|fill_horizontal"> + + + + + + + - - - - - - - + - + \ No newline at end of file diff --git a/packages/SystemUI/res/drawable/brightness_progress_drawable_thick.xml b/packages/SystemUI/res/drawable/brightness_progress_drawable_thick.xml deleted file mode 100644 index 73b02f4fa481f..0000000000000 --- a/packages/SystemUI/res/drawable/brightness_progress_drawable_thick.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml b/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml index 9cc09aa42f408..f4d5304d3d0e8 100644 --- a/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml +++ b/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml @@ -1,5 +1,5 @@ - - + android:layout_gravity="center"> + android:importantForAccessibility="no" > - - - - - - - - + diff --git a/packages/SystemUI/res/layout/quick_settings_brightness_dialog_thick.xml b/packages/SystemUI/res/layout/quick_settings_brightness_dialog_thick.xml deleted file mode 100644 index 6cee38d278764..0000000000000 --- a/packages/SystemUI/res/layout/quick_settings_brightness_dialog_thick.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - diff --git a/packages/SystemUI/res/values-h740dp-port/dimens.xml b/packages/SystemUI/res/values-h740dp-port/dimens.xml index 4a23ee637e2db..966066ffe56b7 100644 --- a/packages/SystemUI/res/values-h740dp-port/dimens.xml +++ b/packages/SystemUI/res/values-h740dp-port/dimens.xml @@ -19,9 +19,9 @@ 24dp - 54dp + 46dp 18dp \ No newline at end of file diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 2a2bb99ff8a88..7fc9ab1b0f240 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -449,7 +449,7 @@ @dimen/match_parent - 56dp + 48dp @dimen/notification_panel_width @@ -531,10 +531,10 @@ 12dp -12dp - 36dp + 28dp 0dp -1dp 44dp diff --git a/packages/SystemUI/res/values/flags.xml b/packages/SystemUI/res/values/flags.xml index 6af982ddad728..076310924056d 100644 --- a/packages/SystemUI/res/values/flags.xml +++ b/packages/SystemUI/res/values/flags.xml @@ -33,8 +33,6 @@ false - false - false diff --git a/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java b/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java index bdb392608455f..357256cba1315 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java +++ b/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java @@ -58,10 +58,9 @@ public class BrightnessController implements ToggleSlider.Listener { private static final int SLIDER_ANIMATION_DURATION = 3000; private static final int MSG_UPDATE_SLIDER = 1; - private static final int MSG_SET_CHECKED = 2; - private static final int MSG_ATTACH_LISTENER = 3; - private static final int MSG_DETACH_LISTENER = 4; - private static final int MSG_VR_MODE_CHANGED = 5; + private static final int MSG_ATTACH_LISTENER = 2; + private static final int MSG_DETACH_LISTENER = 3; + private static final int MSG_VR_MODE_CHANGED = 4; private static final Uri BRIGHTNESS_MODE_URI = Settings.System.getUriFor(Settings.System.SCREEN_BRIGHTNESS_MODE); @@ -80,7 +79,6 @@ public class BrightnessController implements ToggleSlider.Listener { private final int mDisplayId; private final Context mContext; private final ToggleSlider mControl; - private final boolean mAutomaticAvailable; private final DisplayManager mDisplayManager; private final CurrentUserTracker mUserTracker; private final IVrManager mVrManager; @@ -219,16 +217,12 @@ public class BrightnessController implements ToggleSlider.Listener { private final Runnable mUpdateModeRunnable = new Runnable() { @Override public void run() { - if (mAutomaticAvailable) { - int automatic; - automatic = Settings.System.getIntForUser(mContext.getContentResolver(), - Settings.System.SCREEN_BRIGHTNESS_MODE, - Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL, - UserHandle.USER_CURRENT); - mAutomatic = automatic != Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL; - } else { - mHandler.obtainMessage(MSG_SET_CHECKED, 0).sendToTarget(); - } + int automatic; + automatic = Settings.System.getIntForUser(mContext.getContentResolver(), + Settings.System.SCREEN_BRIGHTNESS_MODE, + Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL, + UserHandle.USER_CURRENT); + mAutomatic = automatic != Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL; } }; @@ -266,9 +260,6 @@ public class BrightnessController implements ToggleSlider.Listener { case MSG_UPDATE_SLIDER: updateSlider(Float.intBitsToFloat(msg.arg1), msg.arg2 != 0); break; - case MSG_SET_CHECKED: - mControl.setChecked(msg.arg1 != 0); - break; case MSG_ATTACH_LISTENER: mControl.setOnChangedListener(BrightnessController.this); break; @@ -312,9 +303,6 @@ public class BrightnessController implements ToggleSlider.Listener { mDefaultBacklightForVr = pm.getBrightnessConstraint( PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_DEFAULT_VR); - - mAutomaticAvailable = context.getResources().getBoolean( - com.android.internal.R.bool.config_automatic_brightness_available); mDisplayManager = context.getSystemService(DisplayManager.class); mVrManager = IVrManager.Stub.asInterface(ServiceManager.getService( Context.VR_SERVICE)); @@ -339,8 +327,7 @@ public class BrightnessController implements ToggleSlider.Listener { } @Override - public void onChanged(boolean tracking, boolean automatic, - int value, boolean stopTracking) { + public void onChanged(boolean tracking, int value, boolean stopTracking) { if (mExternalChange) return; if (mSliderAnimator != null) { @@ -398,12 +385,6 @@ public class BrightnessController implements ToggleSlider.Listener { }); } - private void setMode(int mode) { - Settings.System.putIntForUser(mContext.getContentResolver(), - Settings.System.SCREEN_BRIGHTNESS_MODE, mode, - mUserTracker.getCurrentUserId()); - } - private void setBrightness(float brightness) { mDisplayManager.setTemporaryBrightness(mDisplayId, brightness); } diff --git a/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessSlider.java b/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessSlider.java index ab4895e4112c0..db82057831735 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessSlider.java +++ b/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessSlider.java @@ -21,7 +21,6 @@ import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; -import android.widget.CompoundButton; import android.widget.SeekBar; import androidx.annotation.Nullable; @@ -31,7 +30,6 @@ import com.android.systemui.Gefingerpoken; import com.android.systemui.R; import com.android.systemui.classifier.Classifier; import com.android.systemui.plugins.FalsingManager; -import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.policy.BrightnessMirrorController; import com.android.systemui.util.ViewController; @@ -95,14 +93,12 @@ public class BrightnessSlider extends ViewController implements ToggleSlid @Override protected void onViewAttached() { mBrightnessSliderView.setOnSeekBarChangeListener(mSeekListener); - mBrightnessSliderView.setOnCheckedChangeListener(mCheckListener); mBrightnessSliderView.setOnInterceptListener(mOnInterceptListener); } @Override protected void onViewDetached() { mBrightnessSliderView.setOnSeekBarChangeListener(null); - mBrightnessSliderView.setOnCheckedChangeListener(null); mBrightnessSliderView.setOnDispatchTouchEventListener(null); mBrightnessSliderView.setOnInterceptListener(null); } @@ -132,7 +128,6 @@ public class BrightnessSlider extends ViewController implements ToggleSlid private void setMirror(ToggleSlider toggleSlider) { mMirror = toggleSlider; if (mMirror != null) { - mMirror.setChecked(mBrightnessSliderView.isChecked()); mMirror.setMax(mBrightnessSliderView.getMax()); mMirror.setValue(mBrightnessSliderView.getValue()); mBrightnessSliderView.setOnDispatchTouchEventListener(this::mirrorTouchEvent); @@ -165,16 +160,6 @@ public class BrightnessSlider extends ViewController implements ToggleSlid mListener = l; } - @Override - public void setChecked(boolean checked) { - mBrightnessSliderView.setChecked(checked); - } - - @Override - public boolean isChecked() { - return mBrightnessSliderView.isChecked(); - } - @Override public void setMax(int max) { mBrightnessSliderView.setMax(max); @@ -206,7 +191,7 @@ public class BrightnessSlider extends ViewController implements ToggleSlid @Override public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { if (mListener != null) { - mListener.onChanged(mTracking, isChecked(), progress, false); + mListener.onChanged(mTracking, progress, false); } } @@ -215,12 +200,9 @@ public class BrightnessSlider extends ViewController implements ToggleSlid mTracking = true; if (mListener != null) { - mListener.onChanged(mTracking, isChecked(), - getValue(), false); + mListener.onChanged(mTracking, getValue(), false); } - setChecked(false); - if (mMirrorController != null) { mMirrorController.showMirror(); mMirrorController.setLocation((View) mBrightnessSliderView.getParent()); @@ -232,8 +214,7 @@ public class BrightnessSlider extends ViewController implements ToggleSlid mTracking = false; if (mListener != null) { - mListener.onChanged(mTracking, isChecked(), - getValue(), true); + mListener.onChanged(mTracking, getValue(), true); } if (mMirrorController != null) { @@ -242,35 +223,15 @@ public class BrightnessSlider extends ViewController implements ToggleSlid } }; - private final CompoundButton.OnCheckedChangeListener mCheckListener = - new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton toggle, boolean checked) { - enableSlider(!checked); - - if (mListener != null) { - mListener.onChanged(mTracking, checked, getValue(), false); - } - - if (mMirror != null) { - mMirror.setChecked(checked); - } - } - }; - /** * Creates a {@link BrightnessSlider} with its associated view. - * - * The views inflated are determined by {@link FeatureFlags#useNewBrightnessSlider()}. */ public static class Factory { - final FeatureFlags mFeatureFlags; private final FalsingManager mFalsingManager; @Inject - public Factory(FeatureFlags featureFlags, FalsingManager falsingManager) { - mFeatureFlags = featureFlags; + public Factory(FalsingManager falsingManager) { mFalsingManager = falsingManager; } @@ -296,9 +257,7 @@ public class BrightnessSlider extends ViewController implements ToggleSlid /** Get the layout to inflate based on what slider to use */ private int getLayout() { - return mFeatureFlags.useNewBrightnessSlider() - ? R.layout.quick_settings_brightness_dialog_thick - : R.layout.quick_settings_brightness_dialog; + return R.layout.quick_settings_brightness_dialog; } } } diff --git a/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessSliderView.java b/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessSliderView.java index 5b71c626bb223..dbd6758b090d7 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessSliderView.java +++ b/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessSliderView.java @@ -17,18 +17,13 @@ package com.android.systemui.settings.brightness; import android.content.Context; -import android.content.res.TypedArray; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.FrameLayout; import android.widget.SeekBar.OnSeekBarChangeListener; -import android.widget.TextView; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import com.android.settingslib.RestrictedLockUtils; import com.android.systemui.Gefingerpoken; @@ -37,23 +32,11 @@ import com.android.systemui.R; /** * {@code FrameLayout} used to show and manipulate a {@link ToggleSeekBar}. * - * It can additionally control a {@link CompoundButton} and display a label. For the class to work, - * add children before inflation with the following ids: - *
    - *
  • {@code @id/slider} of type {@link ToggleSeekBar}
    • - *
  • {@code @id/toggle} of type {@link CompoundButton} (optional)
    • - *
  • {@code @id/label} of type {@link TextView} (optional)
    • - *
*/ public class BrightnessSliderView extends FrameLayout { - @Nullable - private CompoundButton mToggle; @NonNull private ToggleSeekBar mSlider; - @Nullable - private TextView mLabel; - private final CharSequence mText; private DispatchTouchEventListener mListener; private Gefingerpoken mOnInterceptListener; @@ -62,31 +45,15 @@ public class BrightnessSliderView extends FrameLayout { } public BrightnessSliderView(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public BrightnessSliderView(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - - final TypedArray a = context.obtainStyledAttributes( - attrs, R.styleable.ToggleSliderView, defStyle, 0); - mText = a.getString(R.styleable.ToggleSliderView_text); - - a.recycle(); + super(context, attrs); } // Inflated from quick_settings_brightness_dialog or quick_settings_brightness_dialog_thick @Override protected void onFinishInflate() { super.onFinishInflate(); - mToggle = findViewById(R.id.toggle); mSlider = requireViewById(R.id.slider); - - mLabel = findViewById(R.id.label); - if (mLabel != null) { - mLabel.setText(mText); - } mSlider.setAccessibilityLabel(getContentDescription().toString()); } @@ -124,26 +91,12 @@ public class BrightnessSliderView extends FrameLayout { mSlider.setOnSeekBarChangeListener(seekListener); } - /** - * Attaches a listener to the {@link CompoundButton} in the view (if present) so changes to its - * state can be observed - * @param checkListener use {@code null} to remove listener - */ - public void setOnCheckedChangeListener(OnCheckedChangeListener checkListener) { - if (mToggle != null) { - mToggle.setOnCheckedChangeListener(checkListener); - } - } - /** * Enforces admin rules for toggling auto-brightness and changing value of brightness * @param admin * @see ToggleSeekBar#setEnforcedAdmin */ public void setEnforcedAdmin(RestrictedLockUtils.EnforcedAdmin admin) { - if (mToggle != null) { - mToggle.setEnabled(admin == null); - } mSlider.setEnabled(admin == null); mSlider.setEnforcedAdmin(admin); } @@ -156,26 +109,6 @@ public class BrightnessSliderView extends FrameLayout { mSlider.setEnabled(enable); } - /** - * Sets the state of the {@link CompoundButton} if present - * @param checked - */ - public void setChecked(boolean checked) { - if (mToggle != null) { - mToggle.setChecked(checked); - } - } - - /** - * @return the state of the {@link CompoundButton} if present, or {@code true} if not. - */ - public boolean isChecked() { - if (mToggle != null) { - return mToggle.isChecked(); - } - return true; - } - /** * @return the maximum value of the {@link ToggleSeekBar}. */ diff --git a/packages/SystemUI/src/com/android/systemui/settings/brightness/ToggleSlider.java b/packages/SystemUI/src/com/android/systemui/settings/brightness/ToggleSlider.java index 71e4818c605ac..a988c7aeb436e 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/brightness/ToggleSlider.java +++ b/packages/SystemUI/src/com/android/systemui/settings/brightness/ToggleSlider.java @@ -23,8 +23,7 @@ import com.android.systemui.statusbar.policy.BrightnessMirrorController; public interface ToggleSlider { interface Listener { - void onChanged(boolean tracking, boolean automatic, int value, - boolean stopTracking); + void onChanged(boolean tracking, int value, boolean stopTracking); } void setEnforcedAdmin(RestrictedLockUtils.EnforcedAdmin admin); @@ -32,8 +31,6 @@ public interface ToggleSlider { boolean mirrorTouchEvent(MotionEvent ev); void setOnChangedListener(Listener l); - default void setChecked(boolean checked) {} - default boolean isChecked() { return false; } void setMax(int max); int getMax(); void setValue(int value); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/FeatureFlags.java b/packages/SystemUI/src/com/android/systemui/statusbar/FeatureFlags.java index b937dad269e94..f51fbedebad25 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/FeatureFlags.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/FeatureFlags.java @@ -62,11 +62,6 @@ public class FeatureFlags { return mFlagReader.isEnabled(R.bool.flag_keyguard_layout); } - /** b/178485354 */ - public boolean useNewBrightnessSlider() { - return mFlagReader.isEnabled(R.bool.flag_brightness_slider); - } - public boolean useNewLockscreenAnimations() { return mFlagReader.isEnabled(R.bool.flag_lockscreen_animations); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/settings/brightness/BrightnessSliderTest.kt b/packages/SystemUI/tests/src/com/android/systemui/settings/brightness/BrightnessSliderTest.kt index 6d293b5f63b5b..3ed8ecf1d8093 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/settings/brightness/BrightnessSliderTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/settings/brightness/BrightnessSliderTest.kt @@ -20,7 +20,6 @@ import android.testing.AndroidTestingRunner import android.view.MotionEvent import android.view.View import android.view.ViewGroup -import android.widget.CompoundButton import android.widget.SeekBar import androidx.test.filters.SmallTest import com.android.settingslib.RestrictedLockUtils @@ -37,14 +36,12 @@ import org.junit.Test import org.junit.runner.RunWith import org.mockito.ArgumentCaptor import org.mockito.ArgumentMatchers.anyBoolean -import org.mockito.ArgumentMatchers.anyInt import org.mockito.Captor import org.mockito.Mock import org.mockito.Mockito.isNull import org.mockito.Mockito.mock import org.mockito.Mockito.never import org.mockito.Mockito.notNull -import org.mockito.Mockito.times import org.mockito.Mockito.verify import org.mockito.MockitoAnnotations import org.mockito.Mockito.`when` as whenever @@ -72,10 +69,6 @@ class BrightnessSliderTest : SysuiTestCase() { private lateinit var seekBarChangeCaptor: ArgumentCaptor @Mock private lateinit var seekBar: SeekBar - @Captor - private lateinit var checkedChangeCaptor: ArgumentCaptor - @Mock - private lateinit var compoundButton: CompoundButton private var mFalsingManager: FalsingManagerFake = FalsingManagerFake() private lateinit var mController: BrightnessSlider @@ -101,7 +94,6 @@ class BrightnessSliderTest : SysuiTestCase() { fun testListenersAddedOnAttach() { mController.onViewAttached() - verify(brightnessSliderView).setOnCheckedChangeListener(notNull()) verify(brightnessSliderView).setOnSeekBarChangeListener(notNull()) } @@ -111,7 +103,6 @@ class BrightnessSliderTest : SysuiTestCase() { mController.onViewDetached() verify(brightnessSliderView).setOnSeekBarChangeListener(isNull()) - verify(brightnessSliderView).setOnCheckedChangeListener(isNull()) verify(brightnessSliderView).setOnDispatchTouchEventListener(isNull()) } @@ -127,7 +118,6 @@ class BrightnessSliderTest : SysuiTestCase() { verify(brightnessSliderView, never()).max verify(brightnessSliderView, never()).value - verify(brightnessSliderView, never()).isChecked verify(brightnessSliderView).setOnDispatchTouchEventListener(isNull()) } @@ -139,7 +129,6 @@ class BrightnessSliderTest : SysuiTestCase() { verify(brightnessSliderView, never()).max verify(brightnessSliderView, never()).value - verify(brightnessSliderView, never()).isChecked verify(brightnessSliderView).setOnDispatchTouchEventListener(isNull()) } @@ -150,39 +139,14 @@ class BrightnessSliderTest : SysuiTestCase() { val checked = true whenever(brightnessSliderView.max).thenReturn(maxValue) whenever(brightnessSliderView.value).thenReturn(progress) - whenever(brightnessSliderView.isChecked).thenReturn(checked) mController.setMirrorControllerAndMirror(mirrorController) verify(mirror).max = maxValue - verify(mirror).isChecked = checked verify(mirror).value = progress verify(brightnessSliderView).setOnDispatchTouchEventListener(notNull()) } - @Test - fun testSetCheckedRelayed_true() { - mController.isChecked = true - verify(brightnessSliderView).isChecked = true - } - - @Test - fun testSetCheckedRelayed_false() { - mController.isChecked = false - verify(brightnessSliderView).isChecked = false - } - - @Test - fun testGetChecked() { - whenever(brightnessSliderView.isChecked).thenReturn(true) - - assertThat(mController.isChecked).isTrue() - - whenever(brightnessSliderView.isChecked).thenReturn(false) - - assertThat(mController.isChecked).isFalse() - } - @Test fun testSetMaxRelayed() { mController.max = 120 @@ -229,13 +193,12 @@ class BrightnessSliderTest : SysuiTestCase() { @Test fun testSeekBarProgressChanged() { mController.onViewAttached() - whenever(brightnessSliderView.isChecked).thenReturn(true) verify(brightnessSliderView).setOnSeekBarChangeListener(capture(seekBarChangeCaptor)) seekBarChangeCaptor.value.onProgressChanged(seekBar, 23, true) - verify(listener).onChanged(anyBoolean(), eq(true), eq(23), eq(false)) + verify(listener).onChanged(anyBoolean(), eq(23), eq(false)) } @Test @@ -243,7 +206,6 @@ class BrightnessSliderTest : SysuiTestCase() { val parent = mock(ViewGroup::class.java) whenever(brightnessSliderView.value).thenReturn(42) whenever(brightnessSliderView.parent).thenReturn(parent) - whenever(brightnessSliderView.isChecked).thenReturn(true) mController.onViewAttached() mController.setMirrorControllerAndMirror(mirrorController) @@ -251,7 +213,7 @@ class BrightnessSliderTest : SysuiTestCase() { seekBarChangeCaptor.value.onStartTrackingTouch(seekBar) - verify(listener).onChanged(eq(true), eq(true), eq(42), eq(false)) + verify(listener).onChanged(eq(true), eq(42), eq(false)) verify(mirrorController).showMirror() verify(mirrorController).setLocation(parent) } @@ -259,7 +221,6 @@ class BrightnessSliderTest : SysuiTestCase() { @Test fun testSeekBarTrackingStopped() { whenever(brightnessSliderView.value).thenReturn(23) - whenever(brightnessSliderView.isChecked).thenReturn(true) mController.onViewAttached() mController.setMirrorControllerAndMirror(mirrorController) @@ -267,38 +228,7 @@ class BrightnessSliderTest : SysuiTestCase() { seekBarChangeCaptor.value.onStopTrackingTouch(seekBar) - verify(listener).onChanged(eq(false), eq(true), eq(23), eq(true)) + verify(listener).onChanged(eq(false), eq(23), eq(true)) verify(mirrorController).hideMirror() } - - @Test - fun testButtonCheckedChanged_false() { - val checked = false - - mController.onViewAttached() - mController.setMirrorControllerAndMirror(mirrorController) - verify(brightnessSliderView).setOnCheckedChangeListener(capture(checkedChangeCaptor)) - - checkedChangeCaptor.value.onCheckedChanged(compoundButton, checked) - - verify(brightnessSliderView).enableSlider(!checked) - verify(listener).onChanged(anyBoolean(), eq(checked), anyInt(), eq(false)) - // Called once with false when the mirror is set - verify(mirror, times(2)).isChecked = checked - } - - @Test - fun testButtonCheckedChanged_true() { - val checked = true - - mController.onViewAttached() - mController.setMirrorControllerAndMirror(mirrorController) - verify(brightnessSliderView).setOnCheckedChangeListener(capture(checkedChangeCaptor)) - - checkedChangeCaptor.value.onCheckedChanged(compoundButton, checked) - - verify(brightnessSliderView).enableSlider(!checked) - verify(listener).onChanged(anyBoolean(), eq(checked), anyInt(), eq(false)) - verify(mirror).isChecked = checked - } } \ No newline at end of file