diff options
| author | Michael Kolb <kolby@google.com> | 2010-08-23 17:45:35 -0700 |
|---|---|---|
| committer | Michael Kolb <kolby@google.com> | 2010-08-25 09:46:41 -0700 |
| commit | 0998b0a02bcb8606881df8ed6ae204b5367ca4f9 (patch) | |
| tree | 7e625575e57ffe29a5fa110302638d531537d109 | |
| parent | 197ad327643a500651fe2233890772ec8c059d25 (diff) | |
| download | packages_apps_Browser-0998b0a02bcb8606881df8ed6ae204b5367ca4f9.zip packages_apps_Browser-0998b0a02bcb8606881df8ed6ae204b5367ca4f9.tar.gz packages_apps_Browser-0998b0a02bcb8606881df8ed6ae204b5367ca4f9.tar.bz2 | |
fixed Combo page for phone screen
Change-Id: I43261d95d896db0bc07ff7db02466050d7c6a242
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 10 | ||||
| -rw-r--r-- | src/com/android/browser/CombinedBookmarkHistoryActivity.java | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index e44ebcb..5fe62b1 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -3967,15 +3967,17 @@ public class BrowserActivity extends Activity intent.putExtra(CombinedBookmarkHistoryActivity.STARTING_FRAGMENT, CombinedBookmarkHistoryActivity.FRAGMENT_ID_HISTORY); } + int top = -1; + int height = -1; if (mXLargeScreenSize) { showFakeTitleBar(); int titleBarHeight = ((TitleBarXLarge)mFakeTitleBar).getHeightWithoutProgress(); - intent.putExtra(CombinedBookmarkHistoryActivity.EXTRA_TOP, - mTabBar.getBottom() + titleBarHeight); - intent.putExtra(CombinedBookmarkHistoryActivity.EXTRA_HEIGHT, - getTopWindow().getHeight() - titleBarHeight); + top = mTabBar.getBottom() + titleBarHeight; + height = getTopWindow().getHeight() - titleBarHeight; intent.putExtra(CombinedBookmarkHistoryActivity.NEWTAB_MODE, true); } + intent.putExtra(CombinedBookmarkHistoryActivity.EXTRA_TOP, top); + intent.putExtra(CombinedBookmarkHistoryActivity.EXTRA_HEIGHT, height); startActivityForResult(intent, COMBO_PAGE); } diff --git a/src/com/android/browser/CombinedBookmarkHistoryActivity.java b/src/com/android/browser/CombinedBookmarkHistoryActivity.java index 9422ac8..4ddb20d 100644 --- a/src/com/android/browser/CombinedBookmarkHistoryActivity.java +++ b/src/com/android/browser/CombinedBookmarkHistoryActivity.java @@ -139,8 +139,8 @@ public class CombinedBookmarkHistoryActivity extends Activity Bundle extras = getIntent().getExtras(); if (extras != null) { mNewTabMode = extras.getBoolean(NEWTAB_MODE); - mRequestedTop = extras.getInt(EXTRA_TOP); - mRequestedHeight = extras.getInt(EXTRA_HEIGHT); + mRequestedTop = extras.getInt(EXTRA_TOP, -1); + mRequestedHeight = extras.getInt(EXTRA_HEIGHT, -1); startingFragment = extras.getInt(STARTING_FRAGMENT, FRAGMENT_ID_BOOKMARKS); } |