Do not merge. Make the height remain the same when choosing folder.
Bug:2953515
Change-Id: I0f3df295f7f9825e48671f358c434e8c445b0533
diff --git a/res/layout/browser_add_bookmark.xml b/res/layout/browser_add_bookmark.xml
index 27b8e85..8adf4b6 100644
--- a/res/layout/browser_add_bookmark.xml
+++ b/res/layout/browser_add_bookmark.xml
@@ -72,7 +72,7 @@
<TableLayout android:id="@+id/default_view"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="@dimen/folder_selector_height"
android:layout_weight="1"
android:stretchColumns="1"
android:shrinkColumns="1"
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index ec7f94c..03127dd 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -24,7 +24,7 @@
<dimen name="bookmarkThumbnailWidth">90dip</dimen>
<dimen name="bookmarkThumbnailHeight">80dip</dimen>
<dimen name="add_bookmark_width">500dip</dimen>
- <dimen name="folder_selector_height">300dip</dimen>
+ <dimen name="folder_selector_height">230dip</dimen>
<dimen name="widgetItemMinHeight">48dip</dimen>
<dimen name="favicon_size">16dip</dimen>
<dimen name="favicon_padded_size">20dip</dimen>