diff options
| author | John Reck <jreck@google.com> | 2011-06-20 13:00:12 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2011-06-20 13:21:56 -0700 |
| commit | 9db9529bdb7490ccd72fbe66f7e9c9d7cdd73899 (patch) | |
| tree | 323b6720146f40e7cf44a0726bb2021e71c64315 /res/layout | |
| parent | b6f83376eaf0766a8e5aa6eeb06976f463f37ea0 (diff) | |
| download | packages_apps_browser-9db9529bdb7490ccd72fbe66f7e9c9d7cdd73899.zip packages_apps_browser-9db9529bdb7490ccd72fbe66f7e9c9d7cdd73899.tar.gz packages_apps_browser-9db9529bdb7490ccd72fbe66f7e9c9d7cdd73899.tar.bz2 | |
Re-enable list view mode
Bug: 4645489
Change-Id: Id6eab53a6cb73083781c96a41bfeffec6eae0498
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/bookmark_list.xml | 13 | ||||
| -rw-r--r-- | res/layout/bookmarks.xml | 11 |
2 files changed, 8 insertions, 16 deletions
diff --git a/res/layout/bookmark_list.xml b/res/layout/bookmark_list.xml index 7413ca8..4425a26 100644 --- a/res/layout/bookmark_list.xml +++ b/res/layout/bookmark_list.xml @@ -14,29 +14,30 @@ limitations under the License. --> -<LinearLayout +<com.android.browser.view.BookmarkContainer xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/list_item" android:layout_width="match_parent" android:layout_height="match_parent" android:minHeight="@dimen/widgetItemMinHeight" - android:orientation="horizontal" - android:paddingLeft="16dip"> + android:paddingLeft="16dip" + android:background="@drawable/bookmark_thumb_selector"> <ImageView android:id="@+id/favicon" android:layout_height="32dip" android:layout_width="32dip" - android:layout_gravity="center_vertical" + android:layout_centerVertical="true" android:background="@drawable/bookmark_list_favicon_bg" android:scaleType="fitXY" /> <TextView android:id="@+id/label" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" + android:layout_centerVertical="true" + android:layout_toRightOf="@id/favicon" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingLeft="16dip" android:maxLines="1" android:scrollHorizontally="true" android:ellipsize="marquee"/> -</LinearLayout> +</com.android.browser.view.BookmarkContainer> diff --git a/res/layout/bookmarks.xml b/res/layout/bookmarks.xml index 4a13c6f..e02e2ff 100644 --- a/res/layout/bookmarks.xml +++ b/res/layout/bookmarks.xml @@ -31,7 +31,7 @@ <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent"> - <com.android.browser.view.BookmarkExpandableGridView + <com.android.browser.view.BookmarkExpandableView android:id="@+id/grid" android:layout_width="match_parent" android:layout_height="match_parent" @@ -39,15 +39,6 @@ android:childDivider="@android:color/transparent" android:divider="@android:color/transparent" android:dividerHeight="0dp" /> - <ListView - android:id="@+id/list" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:listSelector="@drawable/bookmark_thumb_selector" - android:drawSelectorOnTop="true" - android:focusable="true" - android:focusableInTouchMode="true" - android:visibility="gone"/> <TextView android:id="@android:id/empty" android:layout_width="wrap_content" |