am 965a65f4: Merge "Update screenshots in a background thread." into froyo
am f389da90: Merge "Use the green box\'s padding, and not the TitleBar\'s padding." into froyo
am 8588d15a: When loading a new Intent, remove appTab association.
am a563d093: Click on notification for unfinished download, open downloads page.
am 54da52d4: Merge "Using ViewStub to defer the inflation of GeolocationPermissionsPrompt until we first show it. This should shave 5% of Browser start up time." into froyo
am 0b82a6f7: Now mBookmarksAdapter is created asynchronously, we need to check null before using it.
am c8393d9c: Move queryBookmarksForUrl to background thread.
Move the creation of the HistoryAdapter to the background.

Bug 2611964

Change-Id: I675bb2de91a0bafe10b49e84abed92aff4e14b08
Merge commit '3a04dd3fa9c62d940256057ac36bf5f1f9281eb3' into HEAD

* commit '3a04dd3fa9c62d940256057ac36bf5f1f9281eb3':
  Move the creation of the HistoryAdapter to the background.

Conflicts:
	src/com/android/browser/BrowserDownloadAdapter.java
	src/com/android/browser/BrowserDownloadPage.java
Added methods and preferences to allow full screen and hiding of zoom controls.
Browser: User-Agent

Add preference options for user agent.

Add user agent dialog title into string values.

Move user agent preference into correct scope.

Add gingerbread as an option and default to it.

Add break; to proper places in switch statement.

Fix whitespace.

Take out duplicate strings, add Build.MODEL to froyo UA.  Add IE 6 and Linux Desktop.  Distinguish Linux/Mac Desktop.

Change-Id: I4cb143af5752fa562eb2d187cef8a7d2e5c7bf5a

Add an Eclair user agent for websites which assume Flash support when device is using Froyo or Gingerbread user agent.
An example of a website with this issue is filmon.com
Using the iPhone user agent isn't possible in streaming video sites as they often send non compatible video.

Change-Id: I38b7d05e7ee6d17694447d27c3cb4963ca83e476
Added control for turning text reflow on/off.