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

Commit b95f3b39 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Fix ugly black background when expanding/collapsing notifications."... 

Merge "Fix ugly black background when expanding/collapsing notifications." into master-lockscreen-dev
parents 99368f94 d274c464

core/java/com/android/internal/widget/SizeAdaptiveLayout.java

+0 −2
Original line number Diff line number Diff line
@@ -107,8 +107,6 @@ public class SizeAdaptiveLayout extends ViewGroup { 
        }

        if (background instanceof ColorDrawable) {

            mModestyPanel.setBackgroundDrawable(background);

        } else {

            mModestyPanel.setBackgroundColor(Color.BLACK);

        }

        SizeAdaptiveLayout.LayoutParams layout =

                new SizeAdaptiveLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,

core/tests/coretests/src/com/android/internal/widget/SizeAdaptiveLayoutTest.java

+0 −11
Original line number Diff line number Diff line
@@ -438,17 +438,6 @@ public class SizeAdaptiveLayoutTest extends AndroidTestCase { 
        assertEquals("ModestyPanel color should match the SizeAdaptiveLayout",

                     panelColor.getColor(), Color.RED);

    }



    @SmallTest

    public void testModestyPanelHasDefault() {

        inflate(R.layout.size_adaptive);

        View panel = mSizeAdaptiveLayout.getModestyPanel();

        assertNull("SizeAdaptiveLayout should have no background for this test",

                     mSizeAdaptiveLayout.getBackground());

        assertTrue("ModestyPanel should have a ColorDrawable background",

                   panel.getBackground() instanceof ColorDrawable);

    }



    @SmallTest

    public void testOpenSmallEvenWhenLargeIsActuallySmall() {

        inflate(R.layout.size_adaptive_lies);