Fix focus highlight bug

    Bug: 5240233
    post the layout change on state change
    add clear button when editing

Change-Id: I9db16619cd39611153503b28757d4b16e52ab9e3
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index eeba9d7..8ed6331 100644
--- a/res/layout/title_bar_nav.xml
+++ b/res/layout/title_bar_nav.xml
@@ -26,6 +26,14 @@
         android:gravity="center_vertical"
         android:orientation="horizontal">
         <ImageView
+            android:id="@+id/magnify"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="8dip"
+            android:paddingRight="8dip"
+            android:visibility="gone"
+            android:src="@drawable/ic_search_category_suggest" />
+        <ImageView
             android:id="@+id/incognito_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -83,6 +91,14 @@
             android:src="@drawable/ic_voice_search_holo_dark"
             style="@style/HoloButton"
             android:visibility="gone" />
+        <ImageView
+            android:id="@+id/clear"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:contentDescription="@string/accessibility_button_clear"
+            android:src="@drawable/ic_close_window_holo_dark"
+            style="@style/HoloButton"
+            android:visibility="gone" />
     </LinearLayout>
     <ImageButton
         android:id="@+id/tab_switcher"