Browser bookmark cleanup

- Option to remove bookmark on clicking "star"
  button
- Add bookmark dialog look cleanup
- Hide "account" in "add bookmark dialog" if only
  one account

Change-Id: I42fd4d54f119bb3bcdb784fd2f6f58570d019eee

2 files changed, 22 insertions, 11 deletions

diff --git a/res/layout/bookmark_group_view.xml b/res/layout/bookmark_group_view.xml
index 8eede042..5bf70fd3 100644
--- a/res/layout/bookmark_group_view.xml
+++ b/res/layout/bookmark_group_view.xml
@@ -21,18 +21,27 @@
     android:orientation="horizontal"
     android:background="?android:attr/listChoiceBackgroundIndicator">
 
+<!--
     <TextView
         android:id="@+id/group_name"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:paddingStart="50dp"
         android:textAppearance="@style/BookmarkText"
-        android:textColor="@color/accent"
         android:gravity="center_vertical" />
+-->
+
+    <TextView
+        android:id="@+id/crumb_overflow"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:textAppearance="@style/BookmarkPathText"
+        android:visibility="gone"
+        />
 
     <FrameLayout
         android:id="@+id/crumb_holder"
-        android:paddingStart="16dp"
+        android:textAppearance="@style/BookmarkPathText"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
diff --git a/res/layout/browser_add_bookmark_content.xml b/res/layout/browser_add_bookmark_content.xml
index f97753dc..186bbc09 100644
--- a/res/layout/browser_add_bookmark_content.xml
+++ b/res/layout/browser_add_bookmark_content.xml
@@ -135,7 +135,8 @@
                     android:ellipsize="end"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
               </TableRow>
-              <TableRow android:layout_marginBottom="10dip">
+              <TableRow android:layout_marginBottom="10dip"
+                  android:id="@+id/row_account">
                 <TextView
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
@@ -203,21 +204,22 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
+        android:gravity="end"
         style="?android:attr/buttonBarStyle">
+        <Button android:id="@+id/delete"
+            android:visibility="gone"
+            android:text="@string/remove_bookmark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="?android:attr/buttonBarButtonStyle" />
         <Button android:id="@+id/cancel"
             android:text="@string/do_not_save"
-            android:layout_width="0dip"
-            android:layout_gravity="end"
-            android:layout_weight="1"
-            android:maxLines="2"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="?android:attr/buttonBarButtonStyle" />
         <Button android:id="@+id/OK"
             android:text="@string/save"
-            android:layout_width="0dip"
-            android:layout_gravity="start"
-            android:layout_weight="1"
-            android:maxLines="2"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="?android:attr/buttonBarButtonStyle" />
     </LinearLayout>