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
diff --git a/res/drawable/ic_action_bookmark.xml b/res/drawable/ic_action_bookmark.xml
index bdce2c7..2d02254 100644
--- a/res/drawable/ic_action_bookmark.xml
+++ b/res/drawable/ic_action_bookmark.xml
@@ -36,6 +36,9 @@
<item android:state_enabled="true" android:state_checked="true"
android:drawable="@drawable/ic_action_bookmark_checked" />
+ <item android:state_enabled="true" android:state_activated="true"
+ android:drawable="@drawable/ic_action_bookmark_checked" />
+
<item android:state_enabled="true" android:state_selected="true"
android:drawable="@drawable/ic_action_bookmark_checked" />
diff --git a/res/layout/bookmark_group_view.xml b/res/layout/bookmark_group_view.xml
index 8eede04..5bf70fd 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 f97753d..186bbc0 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>
diff --git a/res/values-v17/styles.xml b/res/values-v17/styles.xml
index f251c03..63ff214 100644
--- a/res/values-v17/styles.xml
+++ b/res/values-v17/styles.xml
@@ -69,6 +69,14 @@
<item name="android:fontFamily">roboto</item>
</style>
+ <style name="BookmarkPathText">
+ <item name="android:textSize">18sp</item>
+ <item name="android:textColor">@color/bookmarkLabelColor</item>
+ <item name="android:textStyle">normal</item>
+ <item name="android:textAlignment">center</item>
+ <item name="android:fontFamily">roboto</item>
+ </style>
+
<style name="ShortcutTheme" parent="@style/BrowserBase">
</style>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d6d2713..a4cce68 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -153,7 +153,7 @@
<!-- Menu item to save the newly created bookmark to the home screen. [CHAR-LIMIT=30]-->
<string name="add_to_homescreen_menu_option">Home screen</string>
<!-- Menu item to open a picker to determine which folder to save a bookmark in. [CHAR-LIMIT=30]-->
- <string name="add_to_other_folder_menu_option">Other folder</string>
+ <string name="add_to_other_folder_menu_option">Select folder...</string>
<!-- Field label in Bookmark dialog box: title that the user wishes to use for the bookmark -->
<string name="name">Label</string>
<!-- Initial value in Location field in Bookmark dialog box -->
@@ -179,7 +179,7 @@
<!-- Context menu item for setting the bookmark/history item as the homepage -->
<string name="set_as_homepage">Set as homepage</string>
<!-- Toast informing the user that their action to save a bookmark has succeeded -->
- <string name="bookmark_saved">Saved to bookmarks.</string>
+ <string name="bookmark_saved">Bookmarked</string>
<!-- Toast informing the user that their action to save a bookmark did not succeed -->
<string name="bookmark_not_saved">Couldn\'t save bookmark.</string>
<!-- Toast confirming that the homepage has been set -->
@@ -212,6 +212,9 @@
<!-- Confirmation dialog message confirming that the user wishes to delete
the bookmark they selected for deletion -->
<string name="delete_bookmark_warning">Delete bookmark \"<xliff:g id="bookmark">%s</xliff:g>\"?</string>
+ <!-- Confirmation dialog message confirming that the user wishes to delete
+ the folder they selected for deletion -->
+ <string name="delete_folder_warning">Delete folder \"<xliff:g id="bookmark">%s</xliff:g>\"?</string>
<!-- Context menu item to open every bookmark in a folder in new tabs [CHAR LIMIT=50] -->
<string name="open_all_in_new_window">Open all in new tabs</string>
<!-- Menu item to open a dialog which allows the user to enter a url or do search-->