DO NOT MERGE Fix generic filter check

 Bug: 5768794
 Cherry pick from master

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

* commit '0ffa9713dc66c4b0db3027a1edab52c99a3af129':
  DO NOT MERGE Fix generic filter check
merge in ics-mr1-release history after reset to ics-mr1
Reconcile with ics-mr1-release

Change-Id: I0c626aac7eaf78e51a657b4e71c406dda3556c37
Import translations. DO NOT MERGE

Change-Id: I5e24c1781d3dfdc965d29a3e2665122cb0998113
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
merge in ics-mr1-release history after reset to ics-mr1
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
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
Manage Slide Transitions incompatibility in Labs

Slide Tab Transitions is not compatible with Quick Controls because they
both use edge touch detection and solve the same problem. When one
setting is enabled, the other should be disabled. I.e. Slide Tab
Transitions must be disabled in the Labs Settings menu before Quick
Controls can be enabled.

Change-Id: I1b4a019efa50d2e7efb5e0ed643a9041665efaf3
CRs-fixed: 354231
(cherry picked from commit b139ae8afea868118d491dfcb106845f498c2847)