Use tiles for bookmarks
- Use tile based bitmap for bookmarks and history
- Settings UI cleanup
Change-Id: If959cb0b8f110035b8dd2fefe8106e9c5d30f4f1
diff --git a/res/values/attrs_site_tile_view.xml b/res/values/attrs_site_tile_view.xml
new file mode 100644
index 0000000..1cc6c59
--- /dev/null
+++ b/res/values/attrs_site_tile_view.xml
@@ -0,0 +1,35 @@
+<!--
+ Copyright (c) 2015, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<resources>
+ <declare-styleable name="SiteTileView">
+ <attr name="android:src" />
+ <attr name="flat" format="boolean|reference" />
+ <attr name="floating" format="boolean|reference" />
+ </declare-styleable>
+</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 480ca7d..3efdd39 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -49,8 +49,11 @@
<color name="bookmarkListFaviconBackground">#23ffffff</color>
<color name="bookmarkLabelColor">#555555</color>
<color name="comboViewActionBarColor">#ffffff</color>
+ <color name="comboViewBackground">#efeff0</color>
<color name="tabFaviconBackground">#FF555555</color>
<color name="tabFocusHighlight">#FF99CC00</color>
<color name="tabViewTitleBackground">#D0000000</color>
<color name="navtab_bg">#80606060</color>
+
+ <color name="SiteTileOverline">#666</color>
</resources>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 9ddfb98..f2e4710 100755
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -19,8 +19,8 @@
<dimen name="tab_slice">15.5dp</dimen>
<dimen name="tab_focus_stroke">2dip</dimen>
<dimen name="max_tab_width">300dp</dimen>
- <dimen name="bookmarkThumbnailWidth">100dip</dimen>
- <dimen name="bookmarkThumbnailHeight">100dip</dimen>
+ <dimen name="bookmarkThumbnailWidth">90dip</dimen>
+ <dimen name="bookmarkThumbnailHeight">90dip</dimen>
<!--Add for Navigation Feature -->
<dimen name="mynav_item_width">80px</dimen>
<dimen name="mynav_item_width_portrait">80px</dimen>
@@ -48,8 +48,8 @@
<dimen name="widgetVerticalSpacing">6dip</dimen>
<dimen name="widgetColumnWidth">80dip</dimen>
<!-- For the combined Bookmarks History view -->
- <dimen name="combo_paddingTop">50dip</dimen>
- <dimen name="combo_horizontalSpacing">6dip</dimen>
+ <dimen name="combo_paddingTop">48dip</dimen>
+ <dimen name="combo_horizontalSpacing">8dip</dimen>
<dimen name="combo_bookmark_thumbnail_margin">4dip</dimen>
<dimen name="combo_snapshot_item_padding">12dip</dimen>
<dimen name="combo_shadow_height">8dip</dimen>
@@ -85,4 +85,6 @@
<dimen name="edge_swipe_in_slop">25dp</dimen>
<dimen name="edge_swipe_in_additional_slop">50dp</dimen>
<dimen name="edge_swipe_out_slop">18dp</dimen>
+
+ <dimen name="SiteTileOverline">1dp</dimen>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f0436c9..3172642 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -529,7 +529,7 @@
<!-- Settings summmary -->
<string name="pref_security_show_security_warning_summary">Show warning if there\'s a problem with a site\'s security</string>
<!-- Settings Label -->
- <string name="pref_do_not_track">Do Not Track</string>
+ <string name="pref_do_not_track">Request \'Do Not Track\'</string>
<!-- Settings summary -->
<string name="pref_do_not_track_summary">Send a Do Not Track request with your browsing traffic</string>
<!-- Settings label -->
@@ -539,13 +539,15 @@
<string name="pref_security_allow_mic">Microphone</string>
<string name="pref_security_allow_camera">Camera</string>
- <string name="pref_security_web_refiner">Ads and Distracting Content</string>
- <string name="pref_security_accept_third_party_cookies">Third Party Cookies</string>
+ <string name="pref_security_web_refiner">Ads and distracting content</string>
+ <string name="pref_security_accept_third_party_cookies">Third party cookies</string>
<string name="pref_security_ask_before_using">Ask before using</string>
<string name="pref_security_allowed">Allowed</string>
<string name="pref_security_not_allowed">Not allowed</string>
<string name="pref_security_remember">Remember</string>
<string name="pref_security_protect">Protect by default</string>
+ <string name="pref_security_on">On</string>
+ <string name="pref_security_off">Off</string>
<string name="pref_website_title">Website</string>
<string name="pref_security_add">Add</string>
<string name="pref_security_cancel">Cancel</string>
@@ -597,13 +599,14 @@
<!-- Settings screen, section title [CHAR LIMIT=50] -->
<string name="pref_extras_title">Advanced</string>
<!-- Settings label -->
- <string name="pref_extras_website_settings">Per Site Settings</string>
+ <string name="pref_extras_website_settings">Per site settings</string>
<!-- Settings summary -->
<string name="pref_extras_website_settings_summary">Advanced settings for individual websites</string>
<!-- Settings category label [CHAR-LIMIT=50] -->
<string name="pref_extras_reset_default_title">Reset defaults</string>
<!-- Settings label -->
<string name="pref_extras_reset_default">Reset to default</string>
+ <string name="pref_extras_reset">Reset</string>
<!-- Settings summary -->
<string name="pref_extras_reset_default_summary">Restore default settings</string>
<!-- Confirmation dialog message -->
@@ -667,7 +670,7 @@
<item>auto</item>
</string-array>
<string name="pref_default_text_encoding_default">UTF-8</string>
- <string name="pref_edge_swipe_title">Edge Swipe</string>
+ <string name="pref_edge_swipe_title">Edge swipe</string>
<string name="pref_edge_swipe_option_msg">When swiping, would you like:</string>
<string name="pref_temporal_edge_swipe">Previous/Next Web Site</string>
<string name="pref_spatial_edge_swipe">Change Tab</string>
@@ -890,7 +893,7 @@
<string name="webstorage_outofspace_notification_text">Touch to free up space.</string>
<!-- Used in the Browser Settings -->
<string name="webstorage_clear_data_title">Storage</string>
- <string name="webstorage_private_data_title">Private Data</string>
+ <string name="webstorage_private_data_title">Private data</string>
<!-- Confirmation dialog when the user ask to clear all data for an origin -->
<string name="webstorage_clear_data_dialog_message">Delete all data stored by this website?</string>