commit 365561de7c79a1f77f6abacd81d67ad4a7d10a51
author Michael Kolb <kolby@google.com> Thu Aug 18 09:56:25 2011 -0700
committer Michael Kolb <kolby@google.com> Thu Aug 18 09:56:25 2011 -0700
tree 958ed47b79561bab36963fa42109d51a0e250d08
parent 9a75e1bb9b846f29dda007ee8763d5e32fa2341e

Fix black screen bug

    Bug: 5180937
    attach a tab when fast exiting the navscreen

Change-Id: I3ecf248ac6073dfff6a134e5323052150c4efed1

src/com/android/browser/PhoneUi.java

diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index 009989b..f5a76b9 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -334,12 +334,22 @@
         if (mNavScreen == null) return;
         final Tab tab = mNavScreen.getSelectedTab();
         if ((tab == null) || !animate) {
+            if (tab != null) {
+                setActiveTab(tab);
+            } else if (mTabControl.getTabCount() > 0) {
+                // use a fallback tab
+                setActiveTab(mTabControl.getCurrentTab());
+            }
             mContentView.setVisibility(View.VISIBLE);
             finishAnimateOut();
             return;
         }
         NavTabView tabview = (NavTabView) mNavScreen.getSelectedTabView();
         if (tabview == null) {
+            if (mTabControl.getTabCount() > 0) {
+                // use a fallback tab
+                setActiveTab(mTabControl.getCurrentTab());
+            }
             mContentView.setVisibility(View.VISIBLE);
             finishAnimateOut();
             return;