Merge "Fix crashes when inserting."
diff --git a/res/menu/browser.xml b/res/menu/browser.xml
index 6b119e1..b5d56c8 100644
--- a/res/menu/browser.xml
+++ b/res/menu/browser.xml
@@ -23,7 +23,7 @@
<item android:id="@+id/bookmarks_menu_id"
android:title="@string/bookmarks"
android:alphabeticShortcut="b"
- android:icon="@drawable/ic_bookmarks_history_normal"
+ android:icon="@drawable/ic_menu_bookmarks"
/>
<item android:id="@+id/active_tabs_menu_id"
android:title="@string/active_tabs"
@@ -34,34 +34,34 @@
<item android:id="@+id/forward_menu_id"
android:title="@string/forward"
android:alphabeticShortcut="k"
- android:icon="@drawable/ic_forward_normal" />
+ android:icon="@*android:drawable/ic_menu_forward" />
<item android:id="@+id/add_bookmark_menu_id"
android:title="@string/save_to_bookmarks"
android:icon="@drawable/ic_menu_add_bookmark"
android:alphabeticShortcut="a" />
<item android:id="@+id/find_menu_id"
android:title="@*android:string/find_on_page"
- android:icon="@drawable/ic_menu_findonpage_normal"
+ android:icon="@*android:drawable/ic_menu_find"
android:alphabeticShortcut="f" />
<item android:id="@+id/share_page_menu_id"
android:title="@string/share_page"
- android:icon="@drawable/ic_menu_share_normal"
+ android:icon="@drawable/ic_menu_share"
android:alphabeticShortcut="s" />
<item android:id="@+id/page_info_menu_id"
android:title="@string/page_info"
- android:icon="@drawable/ic_menu_pageinfo_normal"
+ android:icon="@drawable/ic_menu_pageinfo"
android:alphabeticShortcut="g" />
<item android:id="@+id/view_downloads_menu_id"
android:title="@string/menu_view_download"
- android:icon="@drawable/ic_menu_downloads_normal"
+ android:icon="@drawable/ic_menu_downloads"
android:alphabeticShortcut="d" />
<item android:id="@+id/preferences_menu_id"
android:title="@string/menu_preferences"
- android:icon="@drawable/ic_menu_settings_normal"
+ android:icon="@drawable/ic_menu_settings"
android:alphabeticShortcut="p" />
<item android:id="@+id/save_webarchive_menu_id"
android:title="@string/menu_save_webarchive"
- android:icon="@drawable/ic_menu_archive_normal" />
+ />
<!-- followings are debug only -->
<item android:id="@+id/dump_nav_menu_id"
android:title="@string/dump_nav"
@@ -105,11 +105,11 @@
<!-- these items are toggled in and out of @+id/stop_reload_menu_id -->
<item android:id="@+id/stop_menu_id"
android:title="@string/stop"
- android:icon="@drawable/ic_stop_normal"
+ android:icon="@*android:drawable/ic_menu_stop"
android:visible="false" />
<item android:id="@+id/reload_menu_id"
android:title="@string/reload"
- android:icon="@drawable/ic_refresh_normal"
+ android:icon="@*android:drawable/ic_menu_refresh"
android:visible="false" />
</menu>
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index ca63305..c3d3d9c 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -4146,11 +4146,15 @@
// Nothing to do.
return;
}
+ Tab t = mTabControl.getCurrentTab();
+ if (t == null) {
+ // There is no current tab so we cannot toggle the error console
+ return;
+ }
mShouldShowErrorConsole = flag;
- ErrorConsoleView errorConsole = mTabControl.getCurrentTab()
- .getErrorConsole(true);
+ ErrorConsoleView errorConsole = t.getErrorConsole(true);
if (flag) {
// Setting the show state of the console will cause it's the layout to be inflated.