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

Commit 44e493dd 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 

am: b70bb9f7

Change-Id: If3c82f9d9dc70261f1789b67fd60791766ce45b4
parents 98f9c897 b70bb9f7

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

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

        }

        mState = ScrimState.UNINITIALIZED;

        mState = ScrimState.UNINITIALIZED;





        mScrimBehind.setDefaultFocusHighlightEnabled(false);

        mScrimInFront.setDefaultFocusHighlightEnabled(false);



        updateScrims();

        updateScrims();

    }

    }

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

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

                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.

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

     *

     *