Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bee7cd10 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update keyguard status bar when dozing changes" into main

parents 4c8d3ba6 23e9f3e2

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewControllerTest.kt

+0 −3
Original line number Diff line number Diff line
@@ -560,7 +560,6 @@ class KeyguardStatusBarViewControllerTest : SysuiTestCase() { 
        updateStateToKeyguard()



        controller.setDozing(true)

        controller.updateViewState()



        Truth.assertThat(keyguardStatusBarView.visibility).isEqualTo(View.INVISIBLE)

    }
@@ -573,7 +572,6 @@ class KeyguardStatusBarViewControllerTest : SysuiTestCase() { 
        updateStateToKeyguard()



        controller.setDozing(false)

        controller.updateViewState()



        Truth.assertThat(keyguardStatusBarView.visibility).isEqualTo(View.VISIBLE)

    }
@@ -633,7 +631,6 @@ class KeyguardStatusBarViewControllerTest : SysuiTestCase() { 
        Truth.assertThat(keyguardStatusBarView.visibility).isEqualTo(View.VISIBLE)



        controller.setDozing(true)

        controller.updateViewState()



        // setDozing(true) should typically cause the view to hide. But since the flag is on, we

        // should ignore these set dozing calls and stay the same visibility.

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java

+1 −0
Original line number Diff line number Diff line
@@ -528,6 +528,7 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat 
            return;

        }

        mDozing = dozing;

        updateViewState();

    }



    /** Animate the keyguard status bar in. */