Show a remove button for existing bookmarks.
Bug:3222677
Change-Id: Id11585bc68f239a02aa477898f6c00792ad44093
diff --git a/res/layout/browser_add_bookmark.xml b/res/layout/browser_add_bookmark.xml
index e25f903..5eebc0b 100644
--- a/res/layout/browser_add_bookmark.xml
+++ b/res/layout/browser_add_bookmark.xml
@@ -25,6 +25,8 @@
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
android:visibility="gone"
+ android:paddingLeft="5dip"
+ android:paddingRight="5dip"
>
<com.android.browser.BreadCrumbView android:id="@+id/crumbs"
android:layout_width="wrap_content"
@@ -53,16 +55,41 @@
android:layout_centerVertical="true"
/>
</RelativeLayout>
- <TextView android:id="@+id/fake_title"
- android:layout_width="wrap_content"
+ <LinearLayout android:id="@+id/title_holder"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:orientation="horizontal"
android:minHeight="?android:attr/listPreferredItemHeight"
- android:drawableLeft="@drawable/ic_list_bookmark"
- android:text="@string/bookmark_this_page"
- android:layout_gravity="left"
- android:gravity="center_vertical"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
+ android:paddingLeft="5dip"
+ android:paddingRight="5dip"
+ >
+ <TextView android:id="@+id/fake_title"
+ android:layout_width="0dip"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:gravity="center_vertical"
+ android:drawableLeft="@drawable/ic_list_bookmark"
+ android:text="@string/bookmark_this_page"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+ <ImageView android:id="@+id/remove_divider"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:src="@drawable/crumb_divider"
+ android:layout_centerVertical="true"
+ android:visibility="gone"
+ />
+ <TextView android:id="@+id/remove"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:gravity="center_vertical"
+ android:text="@string/remove"
+ android:drawableLeft="@*android:drawable/ic_menu_delete"
+ android:visibility="gone"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+ </LinearLayout>
<View android:id="@+id/titleDivider"
android:layout_width="match_parent"
android:layout_height="1dip"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 00a2a46..b9ed908 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -152,6 +152,8 @@
<string name="save_to_bookmarks">Add to Bookmarks</string>
<!-- Title of the dialog to bookmark a page -->
<string name="bookmark_this_page">Bookmark this page</string>
+ <!-- Option on bookmark dialog to remove the bookmark [CHAR LIMIT=30] -->
+ <string name="remove">Remove</string>
<!-- Menu item on the bookmarks page, to edit an existing bookmark -->
<string name="edit_bookmark">Edit bookmark</string>
<!-- Context menu item to create a shortcut to the bookmark on the desktop [CHAR LIMIT=50] -->