diff options
| author | Dan Sandler <dsandler@android.com> | 2014-03-12 17:18:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-12 17:18:43 +0000 |
| commit | a07605fcd744740f7c82775de597ff8e8b4bd2d0 (patch) | |
| tree | eb6fd08cf3cf567fe7c206338c7a8cc023b5fd03 /packages | |
| parent | d84133af441caed8102b2da79cdb6f50673b80cb (diff) | |
| parent | 6d94aa7a4e9232f935033cd682596b42bf705370 (diff) | |
| download | frameworks_base-a07605fcd744740f7c82775de597ff8e8b4bd2d0.zip frameworks_base-a07605fcd744740f7c82775de597ff8e8b4bd2d0.tar.gz frameworks_base-a07605fcd744740f7c82775de597ff8e8b4bd2d0.tar.bz2 | |
Merge "Insulate SystemUI from IDs in inflated notification views."
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java | 3 |
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; |