summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com
diff options
context:
space:
mode:
authorDan Sandler <dsandler@android.com>2014-03-12 00:53:21 -0400
committerDan Sandler <dsandler@android.com>2014-03-12 00:53:21 -0400
commit6d94aa7a4e9232f935033cd682596b42bf705370 (patch)
tree24d0d2fd09257c8c55bdf1a2d6dc91f6aaafe7cf /packages/SystemUI/src/com
parent9b3c038c92b1903026448b6469231774d1f1d358 (diff)
downloadframeworks_base-6d94aa7a4e9232f935033cd682596b42bf705370.zip
frameworks_base-6d94aa7a4e9232f935033cd682596b42bf705370.tar.gz
frameworks_base-6d94aa7a4e9232f935033cd682596b42bf705370.tar.bz2
Insulate SystemUI from IDs in inflated notification views.
We use the hidden View.setIsRootNamespace() in the same way that AppWidgetHostView does: to block recursive ID search traversals from traveling into notification views, which might have children with IDs that collide with SystemUI's own views. (Views inside notifications can still be located by ID, but you need to start your search inside the inflated notification row.) Bug: 13421971 Change-Id: If8b81b9d0ed4b0eb6fa1e028275caa0b932f5759
Diffstat (limited to 'packages/SystemUI/src/com')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
index eb07d88..a89921f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
@@ -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;