From 07b2fd9ac55a9f2096423320f5c0e7fdb9b562d8 Mon Sep 17 00:00:00 2001
From: Pankaj Garg <pgarg@codeaurora.org>
Date: Wed, 15 Jul 2015 12:07:37 -0700
Subject: 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
---
 res/values/attrs_site_tile_view.xml | 37 -------------------------------
 res/values/attrs_tiles.xml          | 43 +++++++++++++++++++++++++++++++++++++
 res/values/colors.xml               | 13 +++++++----
 3 files changed, 52 insertions(+), 41 deletions(-)
 delete mode 100644 res/values/attrs_site_tile_view.xml
 create mode 100644 res/values/attrs_tiles.xml

(limited to 'res/values')

diff --git a/res/values/attrs_site_tile_view.xml b/res/values/attrs_site_tile_view.xml
deleted file mode 100644
index 26b8486e..00000000
--- a/res/values/attrs_site_tile_view.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-    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" />
-        <attr name="trustLevel" format="integer|reference" />
-        <attr name="blockedObjects" format="integer|reference" />
-    </declare-styleable>
-</resources>
diff --git a/res/values/attrs_tiles.xml b/res/values/attrs_tiles.xml
new file mode 100644
index 00000000..d6ec2927
--- /dev/null
+++ b/res/values/attrs_tiles.xml
@@ -0,0 +1,43 @@
+<!--
+    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="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 b76ad304..6a3edfd6 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>
-- 
cgit v1.2.3