Porting 1847 and 1599-qrd browser changes

---

  Fix issue with exit dialog showing on downloads

   The dialog was only shown when the download was initiated from
   outside the browser.  Added a property to Tab to identify
   it was created from an intent and handle closing it appropriately.

   Change-Id: I83d342571f3fbf74223e248dd6bb6a8660bca96b

---

  Memory monitor not deleting tabs when switching tabs.
   Fixed bug where tab.destroy() was called only when new tab is
   created. Fix was to check for stale tab when setActiveTab is
   called and destroy webview for it.
   Change-Id: Ibcb6431039ac97fcf21aaab4ace0dfb27f4227dc

---

  Fix content disposition having multiple attributes
   Change-Id: If04e930f16243dd1d4ee0acec3a31dfff971ea78

---

  Fix yahoo search url where url 'http://cn.search.yahoo.com' is
  redirected to 'http://sg.search.yahoo.com/' and query string is
  lost in redirection.
   Change-Id: I326d15528ae3b7a1cd7d90ca7a454c3bfbddfdd2

---

  Fix issue in Autofill delete button
   Change-Id: I9dff2a21d976c3269455b2d112cc964980642f82

---

  Smoother tab transition and miscellaneous UI fixes.
   - Fixed white screen issue seen when render process
     was killed during tab switches.
   - Fixed jankiness with animation during tab switching.
   - Fixed issue where cancelling a dialog was causing
     the menu item to be disabled.
   Change-Id: I099b7ed3fdd8e10142f5ce932192f9db19f9650f

---

  Fixes crash view to be shown for background tabs
   Change-Id: I128e165ecfa7fa44c1d98ba13c5b22719c12d2a7

---

   Fix timing issue with tab animation

    A max num counter is introduced to put a upper limit on time to wait
    for the tab (SurfaceView) to be ready.  This fixes issue seens on JB

    Change-Id: I5519534bc2ea572ca7eb4bb3b1f27921315e9359

---

   Allow copy URI for My Navigation page

    Change-Id: Ic98a2ad426462df7adf748b15b7e2e70a00d382e

---

   Enable WLAN checks.

   - Enable WLAN access point selection if WLAN is enabled
     and access point is available.
   - Prompt user to enable mobile data when WLAN is enabled
     access point is not available.

   Change-Id: I97e0a0053b07357ee438c0d48d0adfa8abbd80a2

---

   Introspect mimetype for octect stream mimetype based on file extension.

     Change-Id: I2b3e039647cf60b595d36261cf2ee391207304bc

---

   Fix crash when handler is null

     Change-Id: I09afd1e8558a5e6473df5b44b5cf4e2584feefe9

---

  Fix for JS interface required for overlay default home page

    Modified how the JS interface is initialized for the default
    home page and included it during the restore of default page.

   Change-Id: I077dc8d56aeb6a1db6159dd8f2a1b812b4cd2c79
---

    Multiple fixes to SWE.

    - Fix showing added navigation correctly.
    - Fix showing white screen when creating new tab.

    Change-Id: I209f7f5a903a930f021f0a680547bba3dd74d597

---
     Pause newly created tab when it is in background

     - When a new tab is opened in background, we need to ensure that the
       tab is properly paused.

     Change-Id: I45e1286de2a89d74581decf3c0c2a23655ae0c47
---
     Fix for disappearing title bar caused by copy/paste control

     Change-Id: I19860bd9356b2dc392539aa1e16819545e32de6d

---
     Geolocation improvements

      - Provide users the option to make geolocation permission choices that are
        only good for a day.
      - Add a clickable icon to indicate that a site has permission to request
        Geolocation information. Selecting the icon allows the user to edit/clear
        the geolocation policy for the current origin
      - Enhanced preferences under Settings > Advanced > Website settings to allow
        users to modify/clear the per origin geolocation policy
      - Disable importing approved origins from
        /data/data/com.android.providers.settings/databases/settings.db

      Change-Id: Iafe0ea63f487e06bffecea4fbfc6db2b7b0b85c6

---
      Add DuckDuckGo to list of search engines

       - User can now switch to DuckDuckGo from Settings->Advanced->Set search engine.

      Change-Id: I2ef5624d1eea7bd257c6619cc65b057ed865b5df
---
      Capture thumbnail when tab is paused

        - Fixes blank tab thumbnail when a tab is opened via adb comman

      Change-Id: I817d65575c88c37e6ac5828ea8e561dae6a14ba6
---
      Fix for tab thumbnail preview cropped in landscape orientation

      Change-Id: Id7c14ddad2e465a9057d6cc85710b1f0dc660739
---
      Change menu id for automation test

      Change-Id: Ic089b303d39f8677debeae292b8fd2bad096baef
---
     Do Not Track (Browser)

       - Browser modifications to set the Do Not Track privacy option.

       Change-Id: I262b7a05d43b39837cb84eb79f5844d14277e3fd
---

Change-Id: Icc95bdf4bd8d2bd3e3282f77d7f6a88232b59cda

1 files changed, 7 insertions, 1 deletions

diff --git a/res/xml/privacy_security_preferences.xml b/res/xml/privacy_security_preferences.xml
index 26336000..4c14c866 100644
--- a/res/xml/privacy_security_preferences.xml
+++ b/res/xml/privacy_security_preferences.xml
@@ -37,6 +37,12 @@
             android:title="@string/pref_security_show_security_warning"
             android:summary="@string/pref_security_show_security_warning_summary" />
 
+  <CheckBoxPreference
+            android:key="do_not_track"
+            android:defaultValue="true"
+            android:title="@string/pref_do_not_track"
+            android:summary="@string/pref_do_not_track_summary" />
+
     <PreferenceCategory android:title="@string/pref_privacy_cookies_title">
         <CheckBoxPreference
                 android:key="accept_cookies"
@@ -94,7 +100,7 @@
                 android:key="privacy_clear_passwords"
                 android:title="@string/pref_privacy_clear_passwords"
                 android:summary="@string/pref_privacy_clear_passwords_summary"
-                android:dialogMessage="@string/pref_privacy_clear_passwords_dlg" 
+                android:dialogMessage="@string/pref_privacy_clear_passwords_dlg"
                 android:dialogIcon="@android:drawable/ic_dialog_alert"/>
     </PreferenceCategory>