commit 66f8cef21dee091292fdf8aa346c829ff43ed26a
author Pankaj Garg <pgarg@codeaurora.org> Tue Jul 07 17:29:03 2015 -0700
committer jrizzoli <joey@cyanogenmoditalia.it> Fri Aug 28 13:15:45 2015 +0200
tree 63d19529694099c2a235ccee1ecf2d3c31061448
parent 33551ffea822cb02d1ad88f5a33e046e98eca43f

NavigationBar code cleanup

- Unified code for phone and tablet UI
- Chagned Favicon to use Tiles
- Updates to Tile class

Change-Id: Iecb699a3e5eb848db149705a9142f8f199f02c04

res/layout-sw600dp/title_bar_nav.xml

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"