Updated Tile view for folder and favicon
- New layouts for folder icons in Bookmarks view.
- Reworked favicon tile views.
- Display of SSL certification information on top of favicon
- Modified logic behind showing counter on top of favicon
Change-Id: Iaacc13be37e7cc65e859b46e0d91d5d5d6b62a9e
diff --git a/res/color/clickable_color.xml b/res/color/clickable_color.xml
new file mode 100644
index 0000000..2e50a54
--- /dev/null
+++ b/res/color/clickable_color.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_enabled="true" android:state_pressed="true"
+ android:color="@color/accent" />
+
+ <item android:state_enabled="true" android:state_selected="true"
+ android:color="@color/accent" />
+
+ <item android:color="@color/bookmarkLabelColor" />
+
+</selector>
diff --git a/res/drawable-xxhdpi/img_deco_bookmarks_folder_small_bright.png b/res/drawable-xxhdpi/img_deco_bookmarks_folder_small_bright.png
new file mode 100644
index 0000000..c76ea0d
--- /dev/null
+++ b/res/drawable-xxhdpi/img_deco_bookmarks_folder_small_bright.png
Binary files differ
diff --git a/res/drawable-xxhdpi/img_deco_tile_avoid.png b/res/drawable-xxhdpi/img_deco_tile_avoid.png
new file mode 100644
index 0000000..4e96b81
--- /dev/null
+++ b/res/drawable-xxhdpi/img_deco_tile_avoid.png
Binary files differ
diff --git a/res/drawable-xxhdpi/img_deco_tile_avoid_accent.png b/res/drawable-xxhdpi/img_deco_tile_avoid_accent.png
new file mode 100644
index 0000000..defcc26
--- /dev/null
+++ b/res/drawable-xxhdpi/img_deco_tile_avoid_accent.png
Binary files differ
diff --git a/res/drawable-xxhdpi/img_deco_tile_unknown.png b/res/drawable-xxhdpi/img_deco_tile_unknown.png
new file mode 100644
index 0000000..80a263a
--- /dev/null
+++ b/res/drawable-xxhdpi/img_deco_tile_unknown.png
Binary files differ
diff --git a/res/drawable-xxhdpi/img_deco_tile_unknown_accent.png b/res/drawable-xxhdpi/img_deco_tile_unknown_accent.png
new file mode 100644
index 0000000..9fba533
--- /dev/null
+++ b/res/drawable-xxhdpi/img_deco_tile_unknown_accent.png
Binary files differ
diff --git a/res/drawable-xxhdpi/img_deco_tile_untrusted.png b/res/drawable-xxhdpi/img_deco_tile_untrusted.png
new file mode 100644
index 0000000..79568c3
--- /dev/null
+++ b/res/drawable-xxhdpi/img_deco_tile_untrusted.png
Binary files differ
diff --git a/res/drawable-xxhdpi/img_deco_tile_untrusted_accent.png b/res/drawable-xxhdpi/img_deco_tile_untrusted_accent.png
new file mode 100644
index 0000000..0955608
--- /dev/null
+++ b/res/drawable-xxhdpi/img_deco_tile_untrusted_accent.png
Binary files differ
diff --git a/res/drawable-xxhdpi/img_deco_tile_verified.png b/res/drawable-xxhdpi/img_deco_tile_verified.png
new file mode 100644
index 0000000..ec2098b
--- /dev/null
+++ b/res/drawable-xxhdpi/img_deco_tile_verified.png
Binary files differ
diff --git a/res/drawable-xxhdpi/img_deco_tile_verified_accent.png b/res/drawable-xxhdpi/img_deco_tile_verified_accent.png
new file mode 100644
index 0000000..592bdf5
--- /dev/null
+++ b/res/drawable-xxhdpi/img_deco_tile_verified_accent.png
Binary files differ
diff --git a/res/layout/bookmark_thumbnail.xml b/res/layout/bookmark_thumbnail.xml
index 8913551..763fcd8 100644
--- a/res/layout/bookmark_thumbnail.xml
+++ b/res/layout/bookmark_thumbnail.xml
@@ -23,10 +23,16 @@
android:paddingEnd="@dimen/combo_horizontalSpacing"
android:paddingStart="@dimen/combo_horizontalSpacing" >
- <com.android.browser.SiteTileView
- android:id="@+id/thumb_image"
+ <FrameLayout
+ android:id="@+id/container"
android:layout_width="@dimen/bookmarkThumbnailWidth"
- android:layout_height="@dimen/bookmarkThumbnailHeight" />
+ android:layout_height="@dimen/bookmarkThumbnailHeight">
+
+ <!-- The SiteTileView or FolderTileView will be injected here dynamically -->
+
+ <!-- The Managed (MDM) badge (an ImageView) will be injected here dynamically -->
+
+ </FrameLayout>
<TextView
android:id="@+id/label"
diff --git a/res/layout/folder_tile_view.xml b/res/layout/folder_tile_view.xml
new file mode 100644
index 0000000..a92f124
--- /dev/null
+++ b/res/layout/folder_tile_view.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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.
+-->
+<!-- Note: the layout_width and height are ignored and replaced at runtime -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="80dp"
+ android:layout_height="80dp"
+ android:orientation="vertical"
+ android:padding="4dp">
+
+ <!-- upper part, with the large bright text -->
+ <TextView
+ android:id="@android:id/text1"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_marginEnd="16dp"
+ android:layout_weight="1"
+ android:ellipsize="end"
+ android:lineSpacingMultiplier="1.2"
+ android:lines="3"
+ android:maxLines="3"
+ android:textColor="@color/FolderTileTitle"
+ android:textSize="16sp" />
+
+ <!-- lower part, with the number of items -->
+ <TextView
+ android:id="@android:id/text2"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:drawableEnd="@drawable/img_deco_bookmarks_folder_small_bright"
+ android:drawablePadding="2dp"
+ android:ellipsize="none"
+ android:gravity="center_vertical"
+ android:singleLine="true"
+ android:textColor="@color/FolderTileCount"
+ android:textSize="10sp"
+ tools:ignore="SmallSp" />
+
+</LinearLayout>
+
diff --git a/res/values-v17/styles.xml b/res/values-v17/styles.xml
index 63ff214..7f1e82a 100644
--- a/res/values-v17/styles.xml
+++ b/res/values-v17/styles.xml
@@ -71,7 +71,8 @@
<style name="BookmarkPathText">
<item name="android:textSize">18sp</item>
- <item name="android:textColor">@color/bookmarkLabelColor</item>
+ <item name="android:textColor">@color/clickable_color</item>
+ <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
<item name="android:textStyle">normal</item>
<item name="android:textAlignment">center</item>
<item name="android:fontFamily">roboto</item>
diff --git a/res/values/attrs_site_tile_view.xml b/res/values/attrs_tiles.xml
similarity index 89%
rename from res/values/attrs_site_tile_view.xml
rename to res/values/attrs_tiles.xml
index 26b8486..d6ec292 100644
--- a/res/values/attrs_site_tile_view.xml
+++ b/res/values/attrs_tiles.xml
@@ -27,11 +27,17 @@
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" />
+ <attr name="disableBackground" format="boolean|reference" />
<attr name="trustLevel" format="integer|reference" />
<attr name="blockedObjects" format="integer|reference" />
</declare-styleable>
+
+ <declare-styleable name="FolderTileView">
+ <attr name="android:text" />
+ <attr name="android:label" />
+ </declare-styleable>
+
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index b76ad30..6a3edfd 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -55,8 +55,13 @@
<color name="tabViewTitleBackground">#D0000000</color>
<color name="navtab_bg">#80606060</color>
- <color name="SiteTileOverlineUnknown">@android:color/transparent</color>
- <color name="SiteTileOverlineTrusted">#00b813</color>
- <color name="SiteTileOverlineUntrusted">#ebc400</color>
- <color name="SiteTileOverlineAvoid">#d70704</color>
+ <color name="TileBadgeTextAvoid">#fff</color>
+ <color name="TileBadgeTextUntrusted">#333</color>
+ <color name="TileBadgeTextUnknown">#333</color>
+ <color name="TileBadgeTextVerified">#fff</color>
+
+ <!-- xml configuration for FolderTileView -->
+ <color name="FolderTileBackground">#555</color>
+ <color name="FolderTileTitle">#fff</color>
+ <color name="FolderTileCount">#fff</color>
</resources>
