commit 3f65c3831ff82a20f6f0edb08df2d7edae540044
author Michael Kolb <kolby@google.com> Fri Aug 20 15:31:16 2010 -0700
committer Michael Kolb <kolby@google.com> Sat Aug 21 12:35:22 2010 -0700
tree 35624a233aed78b179192962000c4c113c3f51d1
parent 9af72b71354aff4408acb557c858216ffa868738

UI work on CombinedBookmarksHistory
  Adjust the CombinedBookmarksHistory activity to leave TabBar and UrlBar visible
  Enable clicks on the top bars to propagate back to the BrowserActivity

Change-Id: Ie6aed7dc0777d31dafc7c31807adf17a60f57767

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 548eba6..e144f99 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -16,6 +16,10 @@
 
 package com.android.browser;
 
+import com.android.browser.ScrollWebView.ScrollListener;
+import com.android.common.Search;
+import com.android.common.speech.LoggingEvents;
+
 import android.app.ActionBar;
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -82,6 +86,7 @@
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.MenuItem.OnMenuItemClickListener;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
@@ -105,10 +110,6 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.android.browser.ScrollWebView.ScrollListener;
-import com.android.common.Search;
-import com.android.common.speech.LoggingEvents;
-
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -3866,6 +3867,18 @@
                             loadUrl(getTopWindow(), data);
                         }
                     }
+                } else if (resultCode == RESULT_CANCELED) {
+                    if (intent != null) {
+                        float evtx = intent.getFloatExtra(CombinedBookmarkHistoryActivity.EVT_X, -1);
+                        float evty = intent.getFloatExtra(CombinedBookmarkHistoryActivity.EVT_Y, -1);
+                        long now = System.currentTimeMillis();
+                        MotionEvent evt = MotionEvent.obtain(now, now,
+                                MotionEvent.ACTION_DOWN, evtx, evty, 0);
+                        dispatchTouchEvent(evt);
+                        MotionEvent up = MotionEvent.obtain(evt);
+                        up.setAction(MotionEvent.ACTION_UP);
+                        dispatchTouchEvent(up);
+                    }
                 }
                 // Deliberately fall through to PREFERENCES_PAGE, since the
                 // same extra may be attached to the COMBO_PAGE
@@ -4002,7 +4015,13 @@
             intent.putExtra(CombinedBookmarkHistoryActivity.STARTING_FRAGMENT,
                     CombinedBookmarkHistoryActivity.FRAGMENT_ID_HISTORY);
         }
-        if (newTabMode) {
+        if (mXLargeScreenSize) {
+            showFakeTitleBar();
+            int titleBarHeight = ((TitleBarXLarge)mFakeTitleBar).getHeightWithoutProgress();
+            intent.putExtra(CombinedBookmarkHistoryActivity.EXTRA_TOP,
+                    mTabBar.getBottom() + titleBarHeight);
+            intent.putExtra(CombinedBookmarkHistoryActivity.EXTRA_HEIGHT,
+                    getTopWindow().getHeight() - titleBarHeight);
             intent.putExtra(CombinedBookmarkHistoryActivity.NEWTAB_MODE, true);
         }
         startActivityForResult(intent, COMBO_PAGE);