diff options
2 files changed, 18 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessDialog.java b/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessDialog.java index ead10d6da860..9f4ea27b9ee6 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessDialog.java +++ b/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessDialog.java @@ -181,12 +181,16 @@ public class BrightnessDialog extends Activity { if (mCancelTimeoutRunnable != null) { mCancelTimeoutRunnable.run(); } - finish(); + requestFinish(); } return super.onKeyDown(keyCode, event); } + protected void requestFinish() { + finish(); + } + private boolean triggeredByBrightnessKey() { return getIntent().getBooleanExtra(EXTRA_FROM_BRIGHTNESS_KEY, false); } @@ -197,6 +201,6 @@ public class BrightnessDialog extends Activity { } final int timeout = mAccessibilityMgr.getRecommendedTimeoutMillis(DIALOG_TIMEOUT_MILLIS, AccessibilityManager.FLAG_CONTENT_CONTROLS); - mCancelTimeoutRunnable = mMainExecutor.executeDelayed(this::finish, timeout); + mCancelTimeoutRunnable = mMainExecutor.executeDelayed(this::requestFinish, timeout); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/settings/brightness/BrightnessDialogTest.kt b/packages/SystemUI/tests/src/com/android/systemui/settings/brightness/BrightnessDialogTest.kt index 152be6529464..6e487cdd65b5 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/settings/brightness/BrightnessDialogTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/settings/brightness/BrightnessDialogTest.kt @@ -25,9 +25,9 @@ import android.view.ViewGroup import android.view.WindowManagerPolicyConstants.EXTRA_FROM_BRIGHTNESS_KEY import androidx.test.filters.SmallTest import androidx.test.rule.ActivityTestRule -import com.android.systemui.res.R import com.android.systemui.SysuiTestCase import com.android.systemui.activity.SingleActivityFactory +import com.android.systemui.res.R import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper import com.android.systemui.util.concurrency.DelayableExecutor import com.android.systemui.util.concurrency.FakeExecutor @@ -182,5 +182,15 @@ class BrightnessDialogTest : SysuiTestCase() { brightnessControllerFactory, mainExecutor, accessibilityMgr - ) + ) { + private var finishing = false + + override fun isFinishing(): Boolean { + return finishing + } + + override fun requestFinish() { + finishing = true + } + } } |