Reconcile with ics-mr1-release

Change-Id: Ia60d29acdf49193e3f4a950fdfbf187592305aac
am d213f5c9: Merge "Revert "Fix assets and layout for popup window"" into ics-mr1

* commit 'd213f5c9ce56a74acb6efe880c943d3f96a6af95':
  Revert "Fix assets and layout for popup window"
Reconcile with ics-mr1-release

Change-Id: I5fc50124aca3226913fd31a2f4c44f0ef4cd886c
am 1e43249a: Revert "Add new default bookmark"

* commit '1e43249af8df208486d890fc86ae45ab39045221':
  Revert "Add new default bookmark"
Reconcile with ics-mr1-release

Change-Id: Ib4dad2fa74bba05f93b481dfc19efeca63245d78
Make static fields of WSF$Site package-private

This makes a little more sense since they are accessed outside of the
class that they are defined in.

In addition, this fixes errors created by proguard when building with
OpenJDK.

Change-Id: I41d9bbb687628140038eb517ea08517cee37e0c7
am 0ffa9713: DO NOT MERGE Fix generic filter check

* commit '0ffa9713dc66c4b0db3027a1edab52c99a3af129':
  DO NOT MERGE Fix generic filter check
Reconcile with ics-mr1-release

Change-Id: I0c626aac7eaf78e51a657b4e71c406dda3556c37
am 29e5c899: Import translations. DO NOT MERGE

* commit '29e5c8991d5742f962ddfe83dab33993a9b724db':
  Import translations. DO NOT MERGE
move the User Agent selection out of debug

This helps the users on Tablets. Initially the UAString selection is
only possible when the Browser is built with debug enabled, by this
change, it is moved to advanced selection and available in the release
version.

Change-Id: If31e1e58be92e6b2e40ddf29bc98d4c4324f727d
move CPU Upload Path selection to advanced menu
Browser : Open in incognito tab

Long click on a link now allows you to choose
between opening in incognito/regular tab.

Thank Martin for the bright idea :)

Change-Id: Iba8e7446e69ae66e0bd957910e6309fdb0e0b947
Reconcile with ics-mr1-release

Change-Id: I4a7bc2ad77faabb4a173f8486839861b1cc68f20
UserAgent not propagated from Browser to DownloadProvider

Browser does not propagate the userAgent to DownloadProvider
for downloads. When downloads are started the default userAgent
in DownloadProvider is used instead of using the userAgent of
the Browser. This makes downloads on some services / web pages
fail.

This is solved this by including the Browser userAgent in the
request to the DownloadManager.

Change-Id: If4e0f3c29eb7fd5fc585dd01987ae7f0b54ffc32
Merge branch 'master' of https://android.googlesource.com/platform/packages/apps/Browser
DO NOT MERGE: Cherry-pick RealViewSwitcher.java from CAF

Cherry-pick "8c238b5eb1569c14da6596f621722ebabc0c7fbb" from CAF
    Add RealViewSwitcher.java

Change-Id: I7f63431dc6eae662d9bfe63eea6f955190cfd97e
Adding new Browser Labs feature: Slide Tab Transitions

Edge swipe from the sides of the screen to view the previous/next tab in
the same way as the Android homescreen navigates its views. The feature
is enabled by default and can be turned off in Browser settings under
Labs. It is only enabled for the phone UI, it will not run on the tablet
interface. Slide Tab Transitions is incompatible with Quick Actions.

There are still two known issues with the current patch:
- Clipping bug for pages that use the ACCELERATED_COMPOSITING codepath
- Flakiness with the title bar show/hide due to switch to non-embedded
  title bar

Using RealViewSwitcher.java widget from CAF with the following changes:
- Added onScrollStartedListener to notify when a View switch starts
- Added orientationChanged callback

Change-Id: I1f602bbee43b6945a4bac5043ebec8e29379dd3d
Support for runtime WOFF enablement

Change-Id: I6836d86be902eb8897d7b63920cd6159e1d811da
Feature Permission changes for Proteus device api framework

Change-Id: I4ccec0554c1e3f30e899b52479e21c1a9da7b1ca
RealViewSwitcher: Validate execution of onScreenSwitched().

Invoke onScreenSwitched() only if current and new screens indices are
unequal.

CRs-Fixed: 329432
(cherry picked from commit 06bf7f1ba36c89b4f7e01cbc8d19eef37f9af26f)

Change-Id: I5c30a91fa4ef2551f66ad9d63d8f2ef0b76c19da