commit d83132a7e6ae6c6c6242d587457f3836bd06dd48
author John Reck <jreck@google.com> Mon Dec 06 10:15:19 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 06 10:15:19 2010 -0800
tree 2d165a783ca3a9e9850793efb291f3c526f04880
parent 5c2f0f309c8a58b2f582f2f83bd8173eb7ae360a
parent f2057c2691a4339726d09d692f2e57af9ae873ba

Merge "Fix a layout hierarchy bug"

src/com/android/browser/BrowserBookmarksPage.java

diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index 13a0101..1410ce8 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -405,7 +405,8 @@
             hc = (ViewGroup) root.findViewById(R.id.header_container);
             hc.setVisibility(View.VISIBLE);
         }
-        mHeader = inflater.inflate(R.layout.bookmarks_header, hc, true);
+        mHeader = inflater.inflate(R.layout.bookmarks_header, hc, false);
+        hc.addView(mHeader);
         mCrumbs = (BreadCrumbView) mHeader.findViewById(R.id.crumbs);
         mCrumbs.setController(this);
         mCrumbs.setUseBackButton(mCrumbBackButton);