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

7 files changed, 59 insertions, 11 deletions

diff --git a/res/layout-sw600dp/title_bar_nav.xml b/res/layout-sw600dp/title_bar_nav.xml
index a6b8a325..e6abe7c7 100644
--- a/res/layout-sw600dp/title_bar_nav.xml
+++ b/res/layout-sw600dp/title_bar_nav.xml
@@ -53,6 +53,13 @@
         android:layout_weight="1.0"
         android:orientation="horizontal"
         android:background="@drawable/url_background">
+        <com.android.browser.LocationButton
+            android:id="@+id/location_button"
+            android:layout_width="32dip"
+            android:layout_height="20dip"
+            android:visibility="gone"
+            style="@style/HoloButton"
+            android:layout_gravity="center" />
         <ImageView
             android:id="@+id/url_icon"
             android:layout_width="32dip"
diff --git a/res/layout/geolocation_permissions_prompt.xml b/res/layout/geolocation_permissions_prompt.xml
index 1920c05c..d63ef848 100755
--- a/res/layout/geolocation_permissions_prompt.xml
+++ b/res/layout/geolocation_permissions_prompt.xml
@@ -68,14 +68,21 @@
                 android:id="@+id/dont_share_button"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_weight="1"
-                android:layout_width="0dip"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/geolocation_permissions_prompt_dont_share" />
             <Button
+                android:id="@+id/share_for_limited_time_button"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/geolocation_permissions_prompt_share_for_limited_time"/>
+            <Button
                 android:id="@+id/share_button"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_weight="1"
-                android:layout_width="0dip"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/geolocation_permissions_prompt_share" />
         </LinearLayout>
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index 2f1e0a27..3ee99fd0 100644
--- a/res/layout/title_bar_nav.xml
+++ b/res/layout/title_bar_nav.xml
@@ -42,6 +42,12 @@
             android:paddingLeft="4dip"
             android:visibility="gone"
             android:src="@drawable/ic_incognito_holo_dark" />
+        <com.android.browser.LocationButton
+            android:id="@+id/location_button"
+            android:layout_width="32dip"
+            android:layout_height="32dip"
+            android:visibility="gone"
+            style="@style/HoloButton"/>
         <FrameLayout
             android:id="@+id/iconcombo"
             android:layout_width="44dip"
@@ -116,7 +122,7 @@
         android:src="@drawable/ic_windows_holo_dark"
         style="@style/HoloButton" />
     <ImageButton
-        android:id="@+id/more"
+        android:id="@+id/more_browser_settings"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         style="@style/HoloButton"
diff --git a/res/values/all_search_engines.xml b/res/values/all_search_engines.xml
index 2c199f34..5a1de969 100644
--- a/res/values/all_search_engines.xml
+++ b/res/values/all_search_engines.xml
@@ -36,6 +36,14 @@ http://www.opensearch.org/Specifications/OpenSearch/1.1/Draft_4#OpenSearch_1.1_p
 -->
 
 <resources>
+  <string-array name="DuckDuckGo" translatable="false">
+    <item>DuckDuckGo</item>
+    <item>duckduckgo.com</item>
+    <item>http://duckduckgo.com/favicon.ico</item>
+    <item>https://duckduckgo.com/?q={searchTerms}</item>
+    <item>UTF-8</item>
+    <item></item>
+  </string-array>
   <string-array name="yahoo_uk" translatable="false">
     <item>Yahoo! UK &amp; Ireland</item>
     <item>uk.yahoo.com</item>
@@ -151,9 +159,9 @@ http://www.opensearch.org/Specifications/OpenSearch/1.1/Draft_4#OpenSearch_1.1_p
   <string-array name="yahoo_cn" translatable="false">
     <item>&#x4e2d;&#x56fd;&#x96c5;&#x864e;</item>
     <item>cn.yahoo.com</item>
-    <item>http://search.cn.yahoo.com/favicon.ico</item>
-    <item>http://search.cn.yahoo.com/search?ei={inputEncoding}&amp;fr=crmas&amp;p={searchTerms}</item>
-    <item>GB2312</item>
+    <item>http://search.yahoo.com/favicon.ico</item>
+    <item>http://search.yahoo.com/search?ei={inputEncoding}&amp;fr=crmas&amp;p={searchTerms}</item>
+    <item>UTF-8</item>
     <item></item>
   </string-array>
   <string-array name="onet" translatable="false">
diff --git a/res/values/donottranslate-search_engines.xml b/res/values/donottranslate-search_engines.xml
index f83526b7..1709dc80 100644
--- a/res/values/donottranslate-search_engines.xml
+++ b/res/values/donottranslate-search_engines.xml
@@ -26,6 +26,7 @@ Each value in the string-array is the name of a value in all_search_engines.xml
     <item>baidu</item>
     <item>yahoo</item>
     <item>bing</item>
+    <item>DuckDuckGo</item>
   </string-array>
   <string name="default_search_engine_value">baidu</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index eae9ac69..0d505832 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -492,6 +492,10 @@
     <string name="pref_security_show_security_warning">Show security warnings</string>
     <!-- Settings summmary -->
     <string name="pref_security_show_security_warning_summary">Show warning if there\'s a problem with a site\'s security</string>
+    <!-- Settings Label -->
+    <string name="pref_do_not_track">Do Not Track</string>
+    <!-- Settings summary -->
+    <string name="pref_do_not_track_summary">Send a Do Not Track request with your browsing traffic</string>
     <!-- Settings label -->
     <string name="pref_security_accept_cookies">Accept cookies</string>
     <!-- Settings summary -->
@@ -802,6 +806,7 @@
     <!-- Intentional empty elements - used for overlay feature -->
     <string name="def_wifi_browser_interaction_remind_type"></string>
     <string name="def_action_wifi_selection_data_connections"></string>
+    <string name="def_intent_pick_network"></string>
     <string name="def_landing_page"></string>
     <string name="def_useragent"></string>
 
@@ -867,20 +872,28 @@
     <!-- Geolocation -->
     <!-- Permissions prompt -->
     <string name="geolocation_permissions_prompt_message"><xliff:g id="website origin" example="maps.google.com">%s</xliff:g> wants to know your location</string>
-    <string name="geolocation_permissions_prompt_share">Share location</string>
-    <string name="geolocation_permissions_prompt_dont_share">Decline</string>
+    <string name="geolocation_permissions_prompt_share">Allow</string>
+    <string name="geolocation_permissions_prompt_share_for_limited_time">Allow for 24 hours</string>
+    <string name="geolocation_permissions_prompt_dont_share">Deny</string>
     <string name="geolocation_permissions_prompt_remember">Remember preference</string>
     <!-- Permissions prompt toast -->
     <string name="geolocation_permissions_prompt_toast_allowed">This site can access your location. Change this on the Settings &gt; Advanced &gt; Website screen.</string>
     <string name="geolocation_permissions_prompt_toast_disallowed">This site cannot access your location. Change this on the Settings &gt; Advanced &gt; Website screen.</string>
     <!-- Settings -> Advanced -> Website settings -> <origin> -->
-    <string name="geolocation_settings_page_title">Clear location access</string>
+    <string name="geolocation_settings_page_title">Edit location access</string>
     <string name="geolocation_settings_page_summary_allowed">This site can currently access your location</string>
     <string name="geolocation_settings_page_summary_not_allowed">This site can\'t currently access your location</string>
     <!-- Settings page dialog -->
-    <string name="geolocation_settings_page_dialog_message">Clear location access for this website?</string>
+    <string name="geolocation_settings_page_dialog_title">Edit location policy for\n<xliff:g id="website origin" example="maps.google.com">%s</xliff:g></string>
+    <string-array name="geolocation_settings_choices">
+        <item>Deny forever</item>
+        <item>Allow for 24 hours</item>
+        <item>Allow forever</item>
+        <item>Always ask</item>
+    </string-array>
     <string name="geolocation_settings_page_dialog_ok_button">OK</string>
     <string name="geolocation_settings_page_dialog_cancel_button">Cancel</string>
+
     <!-- Label for the menu item in the website settings activity used to clear data stored by all websites -->
     <string name="website_settings_clear_all">Clear all</string>
     <string name="website_settings_clear_all_dialog_message">Delete all website data and location permissions?</string>
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>