diff options
| author | John Reck <jreck@google.com> | 2011-08-11 11:39:25 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-11 11:39:25 -0700 |
| commit | 8535c4e1293483c8b48f5870067de4fb918522c9 (patch) | |
| tree | 3f26ba883fb041e8c6bb58916473d0415341ab5a /res/layout | |
| parent | 132a9ceebaf87e206380316bf7a81924e21fed59 (diff) | |
| parent | 2d963a2899afbe000d1ab498f94de87f25e33184 (diff) | |
| download | packages_apps_Browser-8535c4e1293483c8b48f5870067de4fb918522c9.zip packages_apps_Browser-8535c4e1293483c8b48f5870067de4fb918522c9.tar.gz packages_apps_Browser-8535c4e1293483c8b48f5870067de4fb918522c9.tar.bz2 | |
Merge "Support horizontal swipe in combo activity"
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/bookmarks.xml | 44 |
1 files changed, 15 insertions, 29 deletions
diff --git a/res/layout/bookmarks.xml b/res/layout/bookmarks.xml index e02e2ff..09b442e 100644 --- a/res/layout/bookmarks.xml +++ b/res/layout/bookmarks.xml @@ -14,39 +14,25 @@ limitations under the License. --> -<LinearLayout +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/bookmarks" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" android:paddingTop="@dimen/combo_paddingTop"> - - <FrameLayout - android:id="@+id/header_container" + <com.android.browser.view.BookmarkExpandableView + android:id="@+id/grid" android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center_horizontal" + android:childDivider="@android:color/transparent" + android:divider="@android:color/transparent" + android:dividerHeight="0dp" /> + <TextView + android:id="@android:id/empty" + android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center" + android:textAppearance="?android:attr/textAppearanceLarge" + android:text="@string/empty_bookmarks_folder" android:visibility="gone" /> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent"> - <com.android.browser.view.BookmarkExpandableView - android:id="@+id/grid" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center_horizontal" - android:childDivider="@android:color/transparent" - android:divider="@android:color/transparent" - android:dividerHeight="0dp" /> - <TextView - android:id="@android:id/empty" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:textAppearance="?android:attr/textAppearanceLarge" - android:text="@string/empty_bookmarks_folder" - android:visibility="gone" /> - </FrameLayout> - -</LinearLayout> +</FrameLayout> |