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/drawable-xxhdpi/ic_fav_overlay_good.png b/res/drawable-xxhdpi/ic_fav_overlay_good.png
deleted file mode 100644
index e5211a9..0000000
--- a/res/drawable-xxhdpi/ic_fav_overlay_good.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_fav_overlay_normal.png b/res/drawable-xxhdpi/ic_fav_overlay_normal.png
deleted file mode 100644
index acab304..0000000
--- a/res/drawable-xxhdpi/ic_fav_overlay_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_fav_overlay_severe.png b/res/drawable-xxhdpi/ic_fav_overlay_severe.png
deleted file mode 100644
index 4be624a..0000000
--- a/res/drawable-xxhdpi/ic_fav_overlay_severe.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_fav_overlay_warning.png b/res/drawable-xxhdpi/ic_fav_overlay_warning.png
deleted file mode 100644
index d3d5255..0000000
--- a/res/drawable-xxhdpi/ic_fav_overlay_warning.png
+++ /dev/null
Binary files differ
diff --git a/res/layout-sw600dp/title_bar_nav.xml b/res/layout-sw600dp/title_bar_nav.xml
index 31b375c..b108f33 100644
--- a/res/layout-sw600dp/title_bar_nav.xml
+++ b/res/layout-sw600dp/title_bar_nav.xml
@@ -40,15 +40,16 @@
android:contentDescription="@string/accessibility_button_forward"
android:src="@drawable/ic_action_history_forward" />
- <!-- Stop/Refresh button -->
- <ImageButton
- android:id="@+id/stop"
- style="@style/NavButton"
- android:layout_width="wrap_content"
- android:contentDescription="@string/accessibility_button_stop"
- android:gravity="center_vertical" />
</LinearLayout>
+ <!-- Stop/Refresh button -->
+ <ImageButton
+ android:id="@+id/stop"
+ style="@style/NavButton"
+ android:layout_width="wrap_content"
+ android:contentDescription="@string/accessibility_button_stop"
+ android:gravity="center_vertical" />
+
<LinearLayout
android:id="@+id/urlbar_focused"
android:layout_width="0dip"
@@ -57,20 +58,23 @@
android:orientation="horizontal">
<ImageView
- android:id="@+id/url_icon"
- android:layout_width="32dip"
- android:layout_height="20dip"
- android:layout_gravity="center"
- android:src="@drawable/ic_deco_favicon_normal" />
-
- <ImageView
- android:id="@+id/lock"
- style="@style/HoloIcon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:id="@+id/magnify"
+ android:layout_width="44dp"
+ android:layout_height="match_parent"
+ android:src="@drawable/ic_action_search_normal"
android:layout_gravity="center_vertical"
- android:layout_marginStart="0dip"
- android:visibility="gone" />
+ android:paddingStart="6dp"
+ android:paddingEnd="6dp"
+ android:visibility="visible" />
+
+ <com.android.browser.SiteTileView
+ android:id="@+id/favicon_view"
+ android:layout_width="44dp"
+ android:layout_height="44dp"
+ android:layout_gravity="center_vertical"
+ android:paddingStart="6dp"
+ android:paddingEnd="6dp"
+ android:contentDescription="@string/page_info"/>
<com.android.browser.UrlInputView
android:id="@+id/url"
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index d12c4ff..aa5032d 100644
--- a/res/layout/title_bar_nav.xml
+++ b/res/layout/title_bar_nav.xml
@@ -45,49 +45,13 @@
android:paddingEnd="6dp"
android:visibility="visible" />
- <FrameLayout
- android:id="@+id/iconcombo"
- style="@style/NavButton"
- android:layout_width="44dip"
- android:contentDescription="@string/page_info">
-
- <ImageView
- android:id="@+id/favicon_badge"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"/>
-
- <ImageView
- android:id="@+id/favicon"
- android:layout_width="32dip"
- android:layout_height="32dip"
- android:layout_gravity="center"
- android:paddingStart="6dip"
- android:paddingEnd="6dip"
- android:scaleType="fitCenter" />
-
- <ImageView
- android:id="@+id/lock"
- android:layout_width="32dip"
- android:layout_height="32dip"
- android:layout_gravity="center"
- android:visibility="gone" />
-
- <TextView
- android:id="@+id/notification_counter"
- android:layout_marginTop="6dip"
- android:layout_width="15dp"
- android:layout_height="15dp"
- android:layout_gravity="top|end"
- android:background="@drawable/rounded_rectangle_background"
- android:textColor="#FFFFFF"
- android:textSize="10sp"
- android:gravity="center"
- android:text="99"
- android:textStyle="bold"
- android:visibility="gone" />
-
- </FrameLayout>
+ <com.android.browser.SiteTileView
+ android:id="@+id/favicon_view"
+ android:layout_width="44dp"
+ android:layout_height="44dp"
+ android:paddingStart="6dp"
+ android:paddingEnd="6dp"
+ android:contentDescription="@string/page_info"/>
<ImageView
android:id="@+id/stop"
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>
