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

This commit is contained in:
Dan Sandler
2014-03-12 17:18:42 +00:00
committed by Android (Google) Code Review

View File

@@ -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;