commit 7bdee0b303d8969aace4d3e43be5bb9f16e276bf
author Michael Kolb <kolby@google.com> Mon Aug 01 11:55:38 2011 -0700
committer Michael Kolb <kolby@google.com> Mon Aug 01 12:02:10 2011 -0700
tree 2795d07bf27ec94c2802c660ed9ff3be678f9b17
parent 3bb854b7830f82923af016d7b6731496c5e70c74

fix action bar and menu

    Bug: 5077207
    Bug: 5097486
    cleaned up action bar items
    dynamically change menu items based on context
    bookmarks option added to nav bar menu
    new tab added to navbar menu
    find/addbookmark only on real pages
    removed new incognito tab from tab switcher action bar

Change-Id: I973f20a13bb7d9900041f717aff012e7a2c735b8

res/layout/nav_screen.xml

diff --git a/res/layout/nav_screen.xml b/res/layout/nav_screen.xml
index 8ff4be3..4e00fa3 100644
--- a/res/layout/nav_screen.xml
+++ b/res/layout/nav_screen.xml
@@ -37,28 +37,14 @@
             android:id="@+id/newtab"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:paddingLeft="16dip"
-            android:paddingRight="16dip"
             style="@style/HoloButton"
             android:gravity="center_vertical"
             android:contentDescription="@string/accessibility_button_newtab"
             android:src="@drawable/ic_new_window_holo_dark" />
         <ImageButton
-            android:id="@+id/newincognito"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:paddingLeft="16dip"
-            android:paddingRight="16dip"
-            style="@style/HoloButton"
-            android:gravity="center_vertical"
-            android:contentDescription="@string/accessibility_button_newincognitotab"
-            android:src="@drawable/ic_new_incognito_holo_dark" />
-        <ImageButton
             android:id="@+id/bookmarks"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:paddingLeft="16dip"
-            android:paddingRight="16dip"
             android:contentDescription="@string/accessibility_button_bookmarks"
             android:src="@drawable/ic_bookmarks_history_holo_dark"
             style="@style/HoloButton" />
@@ -66,8 +52,8 @@
             android:id="@+id/more"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:paddingLeft="16dip"
-            android:paddingRight="16dip"
+            android:paddingLeft="8dip"
+            android:paddingRight="8dip"
             style="@style/HoloButton"
             android:gravity="center_vertical"
             android:contentDescription="@string/accessibility_button_more"