NavigationBar code cleanup
- Unified code for phone and tablet UI
- Chagned Favicon to use Tiles
- Updates to Tile class
Change-Id: Iecb699a3e5eb848db149705a9142f8f199f02c04
diff --git a/res/values/attrs_site_tile_view.xml b/res/values/attrs_site_tile_view.xml
index 1cc6c59..26b8486 100644
--- a/res/values/attrs_site_tile_view.xml
+++ b/res/values/attrs_site_tile_view.xml
@@ -31,5 +31,7 @@
<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/colors.xml b/res/values/colors.xml
index 3efdd39..b76ad30 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -55,5 +55,8 @@
<color name="tabViewTitleBackground">#D0000000</color>
<color name="navtab_bg">#80606060</color>
- <color name="SiteTileOverline">#666</color>
+ <color name="SiteTileOverlineUnknown">@android:color/transparent</color>
+ <color name="SiteTileOverlineTrusted">#00b813</color>
+ <color name="SiteTileOverlineUntrusted">#ebc400</color>
+ <color name="SiteTileOverlineAvoid">#d70704</color>
</resources>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index f2e4710..0fc64a4 100755
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -86,5 +86,5 @@
<dimen name="edge_swipe_in_additional_slop">50dp</dimen>
<dimen name="edge_swipe_out_slop">18dp</dimen>
- <dimen name="SiteTileOverline">1dp</dimen>
+ <dimen name="SiteTileOverlineWidth">1dp</dimen>
</resources>