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

Commit 47ff478e authored by Kevin's avatar Kevin
Browse files

Workaround to safely show ambient/HUN views. 

Temporary workaround to get things rolling while a greater fix is
incoming.  This reverts behavior to essentially inflating all
HUN/ambient content views.

Bug: 117933032
Bug: 117894786
Test: manual, runtest systemui
Change-Id: I731ec6e320d1813a8bbca52ceb21c1d8bb4e73ff
parent 095513c4

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInflater.java

+5 −1
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ public class NotificationInflater { 


    public static final int FLAG_CONTENT_VIEW_ALL = ~0;



    // TODO: Heads up and ambient are always inflated as a temporary workaround.

    // See http://b/117933032 and http://b/117894786

    /**

     * Content views that must be inflated at all times.

     */
@@ -109,7 +111,9 @@ public class NotificationInflater { 
    private static final int REQUIRED_INFLATION_FLAGS =

            FLAG_CONTENT_VIEW_CONTRACTED

            | FLAG_CONTENT_VIEW_EXPANDED

            | FLAG_CONTENT_VIEW_PUBLIC;

            | FLAG_CONTENT_VIEW_PUBLIC

            | FLAG_CONTENT_VIEW_HEADS_UP

            | FLAG_CONTENT_VIEW_AMBIENT;



    /**

     * The set of content views to inflate.

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java

+4 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import com.android.systemui.statusbar.notification.stack.NotificationChildrenCon 


import org.junit.Assert;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -139,7 +140,10 @@ public class ExpandableNotificationRowTest extends SysuiTestCase { 
        verify(row).updateShelfIconColor();

    }



    // TODO: Ignoring as a temporary workaround until heads up views can be safely freed.

    // See http://b/117933032

    @Test

    @Ignore

    public void testFreeContentViewWhenSafe() throws Exception {

        ExpandableNotificationRow row = mNotificationTestHelper.createRow(FLAG_CONTENT_VIEW_ALL);

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationInflaterTest.java

+3 −0
Original line number Diff line number Diff line
@@ -115,7 +115,10 @@ public class NotificationInflaterTest extends SysuiTestCase { 
        verify(mRow).onNotificationUpdated();

    }



    // TODO: Ignoring as a temporary workaround until ambient views can be safely freed.

    // See http://b/117894786

    @Test

    @Ignore

    public void testInflationOnlyInflatesSetFlags() throws Exception {

        mNotificationInflater.updateInflationFlag(FLAG_CONTENT_VIEW_HEADS_UP,

                true /* shouldInflate */);