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

Commit a07605fc authored by Dan Sandler's avatar Dan Sandler Committed by Android (Google) Code Review
Browse files

Merge "Insulate SystemUI from IDs in inflated notification views."

parents d84133af 6d94aa7a
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -931,6 +931,7 @@ public abstract class BaseStatusBar extends SystemUI implements
        }

        if (contentViewLocal != null) {
            contentViewLocal.setIsRootNamespace(true);
            SizeAdaptiveLayout.LayoutParams params =
                    new SizeAdaptiveLayout.LayoutParams(contentViewLocal.getLayoutParams());
            params.minHeight = minHeight;
@@ -938,6 +939,7 @@ public abstract class BaseStatusBar extends SystemUI implements
            expanded.addView(contentViewLocal, params);
        }
        if (bigContentViewLocal != null) {
            bigContentViewLocal.setIsRootNamespace(true);
            SizeAdaptiveLayout.LayoutParams params =
                    new SizeAdaptiveLayout.LayoutParams(bigContentViewLocal.getLayoutParams());
            params.minHeight = minHeight+1;
@@ -955,6 +957,7 @@ public abstract class BaseStatusBar extends SystemUI implements
                        expandedPublic, mOnClickHandler);

                if (publicViewLocal != null) {
                    publicViewLocal.setIsRootNamespace(true);
                    SizeAdaptiveLayout.LayoutParams params =
                            new SizeAdaptiveLayout.LayoutParams(publicViewLocal.getLayoutParams());
                    params.minHeight = minHeight;