diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-19 12:43:28 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-19 12:43:28 -0700 |
| commit | 4dc822f828ecc75c39105cef086aa0a1daa81243 (patch) | |
| tree | 72db0bec647d1e7635b598f5ca5da695dfe0ced7 /src/com/android | |
| parent | d87f85ede8552e8560906037c4e47f49d67fcfcd (diff) | |
| parent | 25515f8bd458a2471d13d876cfb0e18d8ff2a00f (diff) | |
| download | packages_apps_Browser-4dc822f828ecc75c39105cef086aa0a1daa81243.tar.gz packages_apps_Browser-4dc822f828ecc75c39105cef086aa0a1daa81243.tar.bz2 packages_apps_Browser-4dc822f828ecc75c39105cef086aa0a1daa81243.zip | |
Merge change 21933 into eclair
* changes:
Fix a bug where we were opening a new tab unnecessarily.
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index e0368c39b..577206a01 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -593,8 +593,11 @@ public class BrowserActivity extends Activity // No matching application tab, try to find a regular tab // with a matching url. appTab = mTabControl.findUnusedTabWithUrl(urlData.mUrl); - if (appTab != null && current != appTab) { - switchToTab(mTabControl.getTabIndex(appTab)); + if (appTab != null) { + if (current != appTab) { + switchToTab(mTabControl.getTabIndex(appTab)); + } + // Otherwise, we are already viewing the correct tab. } else { // if FLAG_ACTIVITY_BROUGHT_TO_FRONT flag is on, the url // will be opened in a new tab unless we have reached |