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

Commit b70bb9f7 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Remove focus highlight from scrims" into pi-dev 

am: b273217c

Change-Id: I417f46a3912229023612ab2dbaac95455024547a
parents 4ebbfef3 b273217c

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

+3 −0
Original line number Diff line number Diff line
@@ -196,6 +196,9 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
        }

        mState = ScrimState.UNINITIALIZED;



        mScrimBehind.setDefaultFocusHighlightEnabled(false);

        mScrimInFront.setDefaultFocusHighlightEnabled(false);



        updateScrims();

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java

+8 −0
Original line number Diff line number Diff line
@@ -469,6 +469,14 @@ public class ScrimControllerTest extends SysuiTestCase { 
                ScrimState.AOD.getAnimateChange());

    }



    @Test

    public void testViewsDontHaveFocusHighlight() {

        Assert.assertFalse("Scrim shouldn't have focus highlight",

                mScrimInFront.getDefaultFocusHighlightEnabled());

        Assert.assertFalse("Scrim shouldn't have focus highlight",

                mScrimBehind.getDefaultFocusHighlightEnabled());

    }



    /**

     * Conserves old notification density after leaving state and coming back.

     *