new bookmark screen part 2
specs here: https://docs.google.com/a/google.com/present/edit?id=0ARMpWryWB2oaY2RkbmZwdnBfODc0Y2diYnBoNDc&hl=en
moved tabs to top
added bread crumbs view for folder hierarchy
changed thumbnail sizes for xlarge screens
Change-Id: I3035f299b343f9aa1ec0dd41772e5594cd6b21f5
diff --git a/res/layout/bookmarks.xml b/res/layout/bookmarks.xml
index d90620c..fa08353 100644
--- a/res/layout/bookmarks.xml
+++ b/res/layout/bookmarks.xml
@@ -14,47 +14,29 @@
limitations under the License.
-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent"
->
-
- <LinearLayout android:id="@android:id/content"
+ android:layout_height="match_parent">
+ <GridView
+ android:id="@+id/grid"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
- >
-
- <Button android:id="@+id/up"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/defaultBookmarksUpButton"
- />
-
- <GridView android:id="@+id/grid"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
-
- android:horizontalSpacing="8dip"
- android:verticalSpacing="14dip"
- android:stretchMode="spacingWidth"
- android:scrollbarStyle="insideInset"
- android:listSelector="@android:drawable/gallery_thumb"
- android:drawSelectorOnTop="true"
- android:focusable="true"
- android:focusableInTouchMode="true"
- android:numColumns="auto_fit"
- />
- </LinearLayout>
-
- <TextView android:id="@android:id/empty"
+ android:horizontalSpacing="16dip"
+ android:verticalSpacing="16dip"
+ android:stretchMode="spacingWidth"
+ android:scrollbarStyle="insideInset"
+ android:listSelector="@android:drawable/gallery_thumb"
+ android:drawSelectorOnTop="true"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ android:numColumns="auto_fit" />
+ <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>
\ No newline at end of file
+ android:visibility="gone" />
+</FrameLayout>
diff --git a/res/layout/bookmarks_history.xml b/res/layout/bookmarks_history.xml
index c0f4d8d..a89a2b9 100644
--- a/res/layout/bookmarks_history.xml
+++ b/res/layout/bookmarks_history.xml
@@ -13,21 +13,74 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="horizontal"
- android:background="@color/black"
->
- <ListView android:id="@android:id/list"
- android:layout_width="0dip"
- android:layout_height="match_parent"
- android:layout_weight="20"
- />
-
- <FrameLayout android:id="@+id/fragment"
- android:layout_width="0dip"
- android:layout_height="match_parent"
- android:layout_weight="80"
- />
+ android:paddingTop="8dip"
+ android:paddingLeft="16dip"
+ android:paddingRight="16dip"
+ android:orientation="vertical"
+ android:background="@color/black">
+ <RelativeLayout
+ android:id="@+id/bar"
+ android:layout_width="match_parent"
+ android:layout_height="48dip">
+ <LinearLayout
+ android:id="@+id/tabs"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:paddingLeft="16dip"
+ android:paddingRight="16dip">
+ <TextView
+ android:id="@+id/historytab"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:paddingLeft="32dip"
+ android:paddingRight="32dip"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:gravity="center_vertical"
+ android:text="@string/tab_history"
+ android:drawableLeft="@drawable/ic_tab_history_selected"
+ android:drawablePadding="16dip" />
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:src="@drawable/divider_vert" />
+ <TextView
+ android:id="@+id/bmtab"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:paddingLeft="32dip"
+ android:paddingRight="32dip"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:gravity="center_vertical"
+ android:text="@string/bookmarks"
+ android:drawableLeft="@drawable/ic_tab_bookmarks_selected"
+ android:drawablePadding="16dip" />
+ <com.android.browser.BreadCrumbView
+ android:id="@+id/crumbs"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:paddingLeft="16dip"
+ android:paddingRight="16dip" />
+ </LinearLayout>
+ <TextView
+ android:id="@+id/addbm"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:text="@string/add_new_bookmark"
+ android:layout_alignParentRight="true"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:gravity="center_vertical"
+ android:background="@null"
+ android:drawableLeft="@drawable/ic_favorite_off_normal"
+ android:drawablePadding="16dip" />
+ </RelativeLayout>
+ <FrameLayout
+ android:id="@+id/fragment"
+ android:paddingTop="8dip"
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1.0" />
</LinearLayout>