From adcc10bcff800dff0448c23e7ae61fd1ca98f167 Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Mon, 2 Mar 2020 17:02:17 +0000
Subject: [PATCH 01/20] Add small onboarding

---
 .../res/drawable/interstitial_high_five.xml   | 116 ++++++++++++++++++
 .../res/layout/activity_system_search.xml     |  10 +-
 .../include_system_search_onboarding.xml      | 114 +++++++++++++++++
 .../main/res/values/string-untranslated.xml   |   4 +
 4 files changed, 242 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable/interstitial_high_five.xml
 create mode 100644 app/src/main/res/layout/include_system_search_onboarding.xml

diff --git a/app/src/main/res/drawable/interstitial_high_five.xml b/app/src/main/res/drawable/interstitial_high_five.xml
new file mode 100644
index 000000000000..c7143252cfb7
--- /dev/null
+++ b/app/src/main/res/drawable/interstitial_high_five.xml
@@ -0,0 +1,116 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="85dp"
+    android:height="85dp"
+    android:viewportWidth="85"
+    android:viewportHeight="85">
+  <path
+      android:pathData="M45,73C62.6731,73 77,58.6731 77,41C77,23.3269 62.6731,9 45,9C27.3269,9 13,23.3269 13,41C13,58.6731 27.3269,73 45,73Z"
+      android:fillColor="#F0F0F0"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M43.3739,30.6592L40.4249,31.244L41.7765,39.4927H32.4379C31.332,39.4927 30.4412,40.3853 30.4412,41.4933C30.4412,42.6013 31.332,43.4939 32.4379,43.4939H43.4968C44.6026,43.4939 45.4935,42.6013 45.4935,41.4933C45.4628,41.3394 43.3739,30.6592 43.3739,30.6592Z"
+      android:fillColor="#FFB652"/>
+  <path
+      android:pathData="M38.1281,41.5685C38.1281,42.6348 37.2337,43.4937 36.1235,43.4937H31.8059C30.6956,43.4937 29.8013,42.6348 29.8013,41.5685C29.8013,40.5023 30.6956,39.6433 31.8059,39.6433H36.1235C37.2337,39.6433 38.1281,40.5023 38.1281,41.5685Z"
+      android:fillColor="#CC8729"/>
+  <path
+      android:pathData="M37.1669,30.8193C37.1669,32.6876 35.6467,34.1884 33.7541,34.1884H30.6516C28.759,34.1884 27.2388,32.6876 27.2388,30.8193C27.2388,28.951 28.759,27.4502 30.6516,27.4502H33.7541C35.6467,27.4502 37.1669,28.951 37.1669,30.8193Z"
+      android:fillColor="#230545"/>
+  <path
+      android:pathData="M39.4094,26.6709L41.744,26.167L42.612,30.7969L40.2774,31.3009L39.4094,26.6709Z"
+      android:fillColor="#DE5833"/>
+  <path
+      android:pathData="M42.5456,23.1679C42.3556,22.173 41.3424,21.5201 40.2975,21.7066C39.2843,21.8932 38.5877,22.8881 38.8093,23.883L39.5059,27.2408C39.6959,28.2357 40.7091,28.8886 41.7223,28.7021C42.7355,28.5156 43.4321,27.5206 43.2105,26.5257L42.5456,23.1679Z"
+      android:fillColor="#DE5833"/>
+  <path
+      android:pathData="M36.7452,44.8501L35.2283,41.3585C34.8642,40.409 33.7114,39.6433 32.7102,39.6433H25.8233C24.6098,39.6433 23.3962,40.8684 23.3962,42.2467C23.3962,43.0124 23.3962,43.3187 23.5479,43.7781L27.3403,53.1198L26.1267,54.3449C25.4593,55.0187 24.7008,56.5195 24.4581,57.714C24.2154,58.9085 24.003,59.858 24.003,59.858H35.5317V48.5868C36.6845,47.7904 37.0486,46.2284 36.7452,44.8501Z"
+      android:fillColor="#FFB652"/>
+  <path
+      android:pathData="M25.9587,39.6433L28.3492,42.1782C28.717,42.5632 29.3912,42.852 29.9122,42.852H31.3833C31.8736,42.852 32.364,42.4349 32.364,41.8894V39.6433"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M34.6566,31.5964C34.6566,34.7022 32.1355,37.2236 29.0303,37.2236H28.2924C25.1871,37.2236 22.666,34.7022 22.666,31.5964V31.4734C22.666,28.3677 25.1871,25.8462 28.2924,25.8462H29.0303C32.1355,25.8462 34.6566,28.3677 34.6566,31.4734V31.5964Z"
+      android:fillColor="#230545"/>
+  <path
+      android:pathData="M33.365,29.5366H31.0899C29.8601,29.5366 28.8147,30.6129 28.8147,31.8736V32.9191H28.784C28.5995,32.5194 28.1998,32.2426 27.7386,32.2426C27.1237,32.2426 26.6011,32.7346 26.6011,33.3804C26.6011,33.9646 27.0315,34.4259 27.5849,34.4874V39.3766C27.5849,40.0531 28.1383,40.6066 28.8147,40.6066H30.352C31.0284,40.6066 31.5818,40.0531 31.5818,39.3766V37.8391H32.5656C34.2259,37.8391 35.5787,36.4861 35.5787,34.8256V31.8736C35.6094,30.6129 34.5948,29.5366 33.365,29.5366Z"
+      android:fillColor="#DE5833"/>
+  <path
+      android:pathData="M30.3516,35.0708V35.3783C30.3516,36.0548 30.9357,36.6083 31.6121,36.6083H32.1655C32.8419,36.6083 33.4261,36.0855 33.4261,35.3783V35.0708H30.3516Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M34.571,32.9045C34.7486,32.9045 34.9263,32.7385 34.9263,32.5062V32.3402C34.9263,32.1411 34.7782,31.9419 34.571,31.9419H34.423C34.2454,31.9419 34.0677,32.1079 34.0677,32.3402V32.5062C34.0677,32.7053 34.2158,32.9045 34.423,32.9045H34.571ZM31.9059,32.9048C32.0835,32.9048 32.2611,32.7389 32.2611,32.5065V32.3406C32.2611,32.1414 32.1131,31.9422 31.9059,31.9422H31.7578C31.5802,31.9422 31.4026,32.1082 31.4026,32.3406V32.5065C31.4026,32.7057 31.5506,32.9048 31.7578,32.9048H31.9059Z"
+      android:fillColor="#230545"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M34.2563,71.152L35.641,59.9065H31.3289L31.3501,59.8447H23.9332L23.0103,64.2478C24.6588,65.8077 26.4731,67.1941 28.4241,68.3779L28.7043,67.5607L28.6247,68.4986C30.3981,69.5569 32.2825,70.4486 34.2563,71.152Z"
+      android:fillColor="#230545"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M33.0833,48.3064H31.3219C30.8228,48.3064 30.4412,48.6273 30.4412,49.269H33.964C33.964,48.6273 33.5824,48.3064 33.0833,48.3064Z"
+      android:fillColor="#CC8729"/>
+  <path
+      android:pathData="M53.5139,18.7095C53.7282,17.6381 53.0545,16.5667 51.9522,16.3524C50.8498,16.1381 49.8393,16.8422 49.6249,17.9136L48.89,21.5564C48.6756,22.6278 49.3493,23.6992 50.4517,23.9134C51.5541,24.1277 52.5646,23.4237 52.7789,22.3523L53.5139,18.7095Z"
+      android:fillColor="#FFC680"/>
+  <path
+      android:pathData="M67.2935,40.9029C66.6505,40.2601 65.3337,39.6785 64.3232,39.6785H58.8726C58.1683,39.6785 57.5252,39.8315 56.9434,40.1377L53.6975,36.8928L50.6047,39.9846L54.3712,43.7192L54.4631,43.811C54.4631,43.9029 54.4324,44.0253 54.4324,44.1172V61.1066H67.5997V47.6375L69.7432,49.4742L72.8054,46.413L67.2935,40.9029Z"
+      android:fillColor="#678FFF"/>
+  <path
+      android:pathData="M47.3895,35.0867C47.0833,36.6172 47.5732,36.8927 47.7876,37.1376L50.6048,39.9845L53.6975,36.8927L50.6048,33.9234L52.8401,22.1073L49.8392,21.4951L47.3895,35.0867Z"
+      android:fillColor="#FFC680"/>
+  <path
+      android:pathData="M59.6079,27.4341H58.4443C56.9132,27.4341 55.6577,28.6892 55.6577,30.2197V34.689C55.6577,36.2502 56.9438,37.5359 58.5055,37.5359H59.6385C61.3227,37.5359 62.7007,36.1584 62.7007,34.4747V30.5259C62.7007,28.8116 61.3227,27.4341 59.6079,27.4341Z"
+      android:fillColor="#FFC680"/>
+  <path
+      android:pathData="M65.1499,35.852C65.1499,36.7704 64.3843,37.5357 63.4657,37.5357C62.547,37.5357 61.7815,36.7704 61.7815,35.852V35.2398C61.7815,34.3214 62.547,33.5562 63.4657,33.5562C64.3843,33.5562 65.1499,34.3214 65.1499,35.2398V35.852Z"
+      android:fillColor="#230545"/>
+  <path
+      android:pathData="M58.719,32.6382V39.985C58.719,40.8421 59.3927,41.5155 60.2501,41.5155H62.0874C62.9448,41.5155 63.6185,40.8421 63.6185,39.985V32.6382H58.719Z"
+      android:fillColor="#FFC680"/>
+  <path
+      android:pathData="M63.0067,32.3623V34.2296C63.0067,34.9643 63.4354,35.6377 64.1091,35.8826C65.2421,36.2806 66.3751,35.3928 66.3751,34.2908V32.148C66.6813,31.6888 66.9875,31.1072 66.9875,30.4338V28.4134C66.9875,27.0359 65.8545,25.9032 64.4766,25.9032C64.0173,25.9032 63.5579,26.0257 63.1905,26.2706L63.0067,26.1175C62.6699,25.7196 61.7819,25.291 60.8326,25.291H56.3925C55.4126,25.291 54.6777,25.9032 54.6164,26.8216H54.5552C53.6365,26.8216 52.9016,27.6481 52.9016,28.5358V28.5971C52.9016,29.4848 53.6059,30.1889 54.4939,30.1889H57.2805C57.9236,30.1889 58.4747,29.8521 58.7503,29.3011C59.5465,30.5562 60.5876,31.199 62.0881,31.4133L63.0067,32.3623Z"
+      android:fillColor="#230545"/>
+  <path
+      android:pathData="M63.2819,33.5869C64.026,33.5869 64.6293,32.9839 64.6293,32.24C64.6293,31.4961 64.026,30.8931 63.2819,30.8931C62.5378,30.8931 61.9346,31.4961 61.9346,32.24C61.9346,32.9839 62.5378,33.5869 63.2819,33.5869Z"
+      android:fillColor="#FFC680"/>
+  <path
+      android:pathData="M60.8628,30.4951V32.7604C60.8628,33.6787 60.0972,34.1685 59.2092,34.1685H55.9021C55.4428,34.1685 55.0447,34.5665 55.0447,35.0256V35.6073C55.0447,37.4133 56.2083,38.7602 57.8619,38.7602H59.4236C61.0159,38.7602 62.3632,37.3827 62.3632,35.6073V30.4951H60.8628Z"
+      android:fillColor="#230545"/>
+  <path
+      android:pathData="M56.8828,36.0049V36.2192C56.8828,36.8926 57.5259,37.2293 58.1689,37.2293H58.7201C59.3938,37.2293 59.945,36.862 59.945,36.2192V36.0049H56.8828Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M58.6583,32.3316C58.842,32.3316 59.0258,32.1785 59.0258,31.9642V31.8112C59.0258,31.6275 58.8727,31.4438 58.6583,31.4438H58.5052C58.3215,31.4438 58.1377,31.5969 58.1377,31.8112V31.9642C58.1377,32.1479 58.2909,32.3316 58.5052,32.3316H58.6583ZM55.9022,32.332C56.0859,32.332 56.2696,32.1789 56.2696,31.9647V31.8116C56.2696,31.6279 56.1165,31.4443 55.9022,31.4443H55.7491C55.5653,31.4443 55.3816,31.5973 55.3816,31.8116V31.9647C55.3816,32.1483 55.5347,32.332 55.7491,32.332H55.9022Z"
+      android:fillColor="#230545"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M67.6002,63.6551V61.1064H54.4329V71.5873C59.4638,70.0377 63.9656,67.2809 67.6002,63.6551Z"
+      android:fillColor="#230545"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M66.8344,47.6372C65.732,47.6372 64.844,48.5249 64.844,49.627V61.1063H67.5999V47.6372H66.8344Z"
+      android:fillColor="#4E79F0"/>
+  <path
+      android:pathData="M39.4463,16.8697L39.7779,15.9561L42.0084,16.9676L41.6768,17.8813L39.4463,16.8697Z"
+      android:fillColor="#C0C0C0"/>
+  <path
+      android:pathData="M47.1007,13.959L47.8442,14.5836L46.1326,16.3376L45.3891,15.713L47.1007,13.959Z"
+      android:fillColor="#C0C0C0"/>
+  <path
+      android:pathData="M42.2453,13.5866L43.1384,13.2065L43.9212,15.5307L43.0281,15.9109L42.2453,13.5866Z"
+      android:fillColor="#C0C0C0"/>
+  <path
+      android:pathData="M76.7861,52.1673C76.7861,50.698 76.3881,50.1776 75.6531,49.4429L72.8053,46.4124L69.7432,49.4735L73.724,53.5142V61.259C73.1115,61.5957 72.4991,62.2692 72.4991,63.0038V66.7384C72.4991,67.8405 73.5709,68.7588 74.6732,68.7588C75.8062,68.7588 76.7861,67.5956 76.7861,66.4629V52.1673Z"
+      android:fillColor="#FFC680"/>
+  <path
+      android:pathData="M24,31.6393C24,29.6393 22.3784,28 20.4324,28C18.4865,28 16.8649,29.5082 16.8649,31.6066V33.541C16.8649,35.4754 15.3405,37.0492 13.5243,37.0492H12C12,39.6721 14.0757,40 15.1459,40H18.227C21.2432,40 24,37.4098 24,34.2951V31.6393Z"
+      android:fillColor="#230545"/>
+  <path
+      android:pathData="M8.2731,52L9.2882,54.2724L4.7358,56.1713L3.8438,53.9611L8.2731,52Z"
+      android:fillColor="#DE5833"/>
+  <path
+      android:pathData="M4.2019,53.7443C5.1173,53.3566 6.1853,53.8039 6.582,54.6985C6.9787,55.5931 6.5209,56.6367 5.6055,57.0244L2.5236,58.2768C1.6082,58.6644 0.5402,58.2171 0.1435,57.3225C-0.2531,56.428 0.2046,55.3843 1.12,54.9967L4.2019,53.7443Z"
+      android:fillColor="#DE5833"/>
+  <path
+      android:pathData="M26.6643,40.5412C25.8985,39.7714 24.6119,39.7714 23.8461,40.5412L15.8509,48.3626L7.7026,51.7498L9.0505,55.0447L18.6692,51.0724C18.7304,51.0416 18.8223,51.0108 18.8836,50.98C19.1286,50.8876 19.3737,50.7337 19.5881,50.5181L26.6643,43.405C27.4301,42.6044 27.4301,41.3418 26.6643,40.5412Z"
+      android:fillColor="#FFB652"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_system_search.xml b/app/src/main/res/layout/activity_system_search.xml
index e198aa6f7f1a..365b3e5233f8 100644
--- a/app/src/main/res/layout/activity_system_search.xml
+++ b/app/src/main/res/layout/activity_system_search.xml
@@ -107,12 +107,12 @@
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.core.widget.NestedScrollView
+        android:id="@+id/results"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:clipToPadding="false"
         android:elevation="4dp"
         android:paddingBottom="4dp"
-        android:id="@+id/results"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -122,13 +122,19 @@
             android:backgroundTint="?attr/colorPrimary"
             android:elevation="4dp">
 
+            <include
+                android:id="@+id/onboarding"
+                layout="@layout/include_system_search_onboarding"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/autocompleteSuggestions"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/onboarding"
                 tools:itemCount="4"
                 tools:listitem="@layout/item_autocomplete_search_suggestion" />
 
diff --git a/app/src/main/res/layout/include_system_search_onboarding.xml b/app/src/main/res/layout/include_system_search_onboarding.xml
new file mode 100644
index 000000000000..fc1d807a6533
--- /dev/null
+++ b/app/src/main/res/layout/include_system_search_onboarding.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+
+<!--
+  ~ Copyright (c) 2018 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/onboarding"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="6dp"
+    android:layout_marginBottom="2dp"
+    android:background="?attr/colorPrimary"
+    android:elevation="2dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/onboardingIcon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/interstitial_high_five"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/onboardingTitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="42dp"
+        android:layout_marginTop="2dp"
+        android:layout_marginEnd="42dp"
+        android:layout_marginBottom="12dp"
+        android:fontFamily="sans-serif"
+        android:gravity="center"
+        android:text="@string/systemSearchOnboardingTitle"
+        android:textColor="?attr/normalTextColor"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/onboardingIcon" />
+
+    <TextView
+        android:id="@+id/onboardingText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="42dp"
+        android:layout_marginTop="6dp"
+        android:layout_marginEnd="42dp"
+        android:layout_marginBottom="12dp"
+        android:fontFamily="sans-serif"
+        android:gravity="center"
+        android:text="@string/systemSearchOnboardingText"
+        android:textColor="?attr/normalTextColor"
+        android:textSize="16sp"
+        android:textStyle="normal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/onboardingTitle" />
+
+    <Button
+        android:id="@+id/okButton"
+        style="?android:attr/borderlessButtonStyle"
+        android:layout_width="0dp"
+        android:layout_height="36dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginBottom="16dp"
+        android:foreground="?attr/selectableItemBackgroundBorderless"
+        android:text="@string/systemSearchOnboardingButtonOk"
+        android:textColor="@color/cornflowerBlue"
+        android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/onboardingText" />
+
+    <Button
+        style="?android:attr/borderlessButtonStyle"
+        android:layout_width="0dp"
+        android:layout_height="36dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="16dp"
+        android:foreground="?attr/selectableItemBackgroundBorderless"
+        android:text="@string/systemSearchOnboardingButtonMore"
+        android:textColor="@color/cornflowerBlue"
+        android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/okButton"
+        app:layout_constraintTop_toBottomOf="@id/onboardingText" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/string-untranslated.xml b/app/src/main/res/values/string-untranslated.xml
index 3138505bdb81..1ca1965ef858 100644
--- a/app/src/main/res/values/string-untranslated.xml
+++ b/app/src/main/res/values/string-untranslated.xml
@@ -21,6 +21,10 @@
     <!-- System Search-->
     <string name="systemSearchDeviceAppLabel">From this device</string>
     <string name="systemSearchAppNotFound">Application could not be found</string>
+    <string name="systemSearchOnboardingText">Thanks for choosing DuckDuckGo!\nNow, when using our search or app, your searches are protected.</string>
+    <string name="systemSearchOnboardingTitle">Privacy, simplified</string>
+    <string name="systemSearchOnboardingButtonMore">Show more</string>
+    <string name="systemSearchOnboardingButtonOk">Got it</string>
 
     <!-- New Onboarding Experience -->
     <string name="onboardingWelcomeTitle">"Welcome to DuckDuckGo!"</string>

From 7e9946ed018709d9003ad15bb6901b3957737694 Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Tue, 3 Mar 2020 12:26:29 +0000
Subject: [PATCH 02/20] Add expanded view

---
 .../systemsearch/SystemSearchViewModelTest.kt |  6 +-
 .../app/systemsearch/SystemSearchActivity.kt  | 37 ++++++--
 .../app/systemsearch/SystemSearchViewModel.kt | 56 +++++++++----
 app/src/main/res/drawable/ic_success.xml      | 29 +++++++
 .../res/layout/activity_system_search.xml     |  2 +-
 .../res/layout/content_about_duck_duck_go.xml |  2 +-
 .../include_system_search_onboarding.xml      | 84 +++++++++++++++++--
 app/src/main/res/values-bg/strings.xml        |  4 +-
 app/src/main/res/values-cs/strings.xml        |  4 +-
 app/src/main/res/values-da/strings.xml        |  4 +-
 app/src/main/res/values-de/strings.xml        |  2 +-
 app/src/main/res/values-el/strings.xml        |  4 +-
 app/src/main/res/values-es/strings.xml        |  4 +-
 app/src/main/res/values-fi/strings.xml        |  4 +-
 app/src/main/res/values-fr/strings.xml        |  4 +-
 app/src/main/res/values-hr/strings.xml        |  4 +-
 app/src/main/res/values-hu/strings.xml        |  4 +-
 app/src/main/res/values-it/strings.xml        |  4 +-
 app/src/main/res/values-lt/strings.xml        |  4 +-
 app/src/main/res/values-nb/strings.xml        |  4 +-
 app/src/main/res/values-nl/strings.xml        |  4 +-
 app/src/main/res/values-pl/strings.xml        |  4 +-
 app/src/main/res/values-pt/strings.xml        |  4 +-
 app/src/main/res/values-ro/strings.xml        |  4 +-
 app/src/main/res/values-ru/strings.xml        |  2 +-
 app/src/main/res/values-sk/strings.xml        |  2 +-
 app/src/main/res/values-sl/strings.xml        |  4 +-
 app/src/main/res/values-sv/strings.xml        |  4 +-
 .../main/res/values/string-untranslated.xml   |  6 +-
 app/src/main/res/values/strings.xml           |  4 +-
 30 files changed, 230 insertions(+), 74 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_success.xml

diff --git a/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt
index 1aa7a0d4da24..f6a3149dac75 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt
@@ -78,7 +78,7 @@ class SystemSearchViewModelTest {
     fun whenUserUpdatesQueryThenViewStateUpdated() = ruleRunBlockingTest {
         testee.userUpdatedQuery(QUERY)
 
-        val newViewState = testee.viewState.value
+        val newViewState = testee.resutlsViewState.value
         assertNotNull(newViewState)
         assertEquals(QUERY, newViewState?.queryText)
         assertEquals(appQueryResult, newViewState?.appResults)
@@ -90,7 +90,7 @@ class SystemSearchViewModelTest {
         testee.userUpdatedQuery(QUERY)
         testee.userClearedQuery()
 
-        val newViewState = testee.viewState.value
+        val newViewState = testee.resutlsViewState.value
         assertNotNull(newViewState)
         assertTrue(newViewState!!.queryText.isEmpty())
         assertTrue(newViewState.appResults.isEmpty())
@@ -102,7 +102,7 @@ class SystemSearchViewModelTest {
         testee.userUpdatedQuery(QUERY)
         testee.userUpdatedQuery(BLANK_QUERY)
 
-        val newViewState = testee.viewState.value
+        val newViewState = testee.resutlsViewState.value
         assertNotNull(newViewState)
         assertTrue(newViewState!!.queryText.isEmpty())
         assertTrue(newViewState.appResults.isEmpty())
diff --git a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
index 2c56d8c7025c..ddbd4cf7abdf 100644
--- a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
@@ -22,6 +22,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.text.Editable
 import android.view.KeyEvent
+import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.TextView
 import android.widget.Toast
@@ -35,11 +36,13 @@ import com.duckduckgo.app.browser.autocomplete.BrowserAutoCompleteSuggestionsAda
 import com.duckduckgo.app.browser.omnibar.OmnibarScrolling
 import com.duckduckgo.app.global.DuckDuckGoActivity
 import com.duckduckgo.app.global.view.TextChangedWatcher
+import com.duckduckgo.app.global.view.hideKeyboard
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.app.statistics.pixels.Pixel.PixelName
 import com.duckduckgo.app.systemsearch.SystemSearchViewModel.Command.*
-import com.duckduckgo.app.systemsearch.SystemSearchViewModel.SystemSearchViewState
+import com.duckduckgo.app.systemsearch.SystemSearchViewModel.SystemSearchResultsViewState
 import kotlinx.android.synthetic.main.activity_system_search.*
+import kotlinx.android.synthetic.main.include_system_search_onboarding.*
 import javax.inject.Inject
 
 class SystemSearchActivity : DuckDuckGoActivity() {
@@ -65,6 +68,7 @@ class SystemSearchActivity : DuckDuckGoActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_system_search)
         configureObservers()
+        configureOnboarding()
         configureAutoComplete()
         configureDeviceAppSuggestions()
         configureDaxButton()
@@ -75,7 +79,7 @@ class SystemSearchActivity : DuckDuckGoActivity() {
 
     override fun onNewIntent(newIntent: Intent?) {
         super.onNewIntent(newIntent)
-        viewModel.resetState()
+        viewModel.resetViewState()
         newIntent?.let { sendLaunchPixels(it) }
     }
 
@@ -88,14 +92,26 @@ class SystemSearchActivity : DuckDuckGoActivity() {
     }
 
     private fun configureObservers() {
-        viewModel.viewState.observe(this, Observer<SystemSearchViewState> {
-            it?.let { renderViewState(it) }
+        viewModel.onboardingViewState.observe(this, Observer<SystemSearchViewModel.OnboardingViewState> {
+            it?.let { renderOnboardingViewState(it) }
+        })
+        viewModel.resutlsViewState.observe(this, Observer<SystemSearchResultsViewState> {
+            it?.let { renderResultsViewState(it) }
         })
         viewModel.command.observe(this, Observer {
             processCommand(it)
         })
     }
 
+    private fun configureOnboarding() {
+        okButton.setOnClickListener {
+            viewModel.userDismissedOnboarding()
+        }
+        toggleButton.setOnClickListener {
+            viewModel.userTappedOnboardingToggle()
+        }
+    }
+
     private fun configureAutoComplete() {
         autocompleteSuggestions.layoutManager = LinearLayoutManager(this)
         autocompleteSuggestionsAdapter = BrowserAutoCompleteSuggestionsAdapter(
@@ -149,7 +165,15 @@ class SystemSearchActivity : DuckDuckGoActivity() {
         clearTextButton.setOnClickListener { viewModel.userClearedQuery() }
     }
 
-    private fun renderViewState(viewState: SystemSearchViewState) {
+    private fun renderOnboardingViewState(viewState: SystemSearchViewModel.OnboardingViewState) {
+        onboarding.visibility = if (viewState.visibile) View.VISIBLE else View.GONE
+        checkmarks.visibility = if (viewState.expanded) View.VISIBLE else View.GONE
+
+        val toggleText = if (viewState.expanded) R.string.systemSearchOnboardingButtonLess else R.string.systemSearchOnboardingButtonMore
+        toggleButton.text = getString(toggleText)
+    }
+
+    private fun renderResultsViewState(viewState: SystemSearchResultsViewState) {
         if (omnibarTextInput.text.toString() != viewState.queryText) {
             omnibarTextInput.setText(viewState.queryText)
             omnibarTextInput.setSelection(viewState.queryText.length)
@@ -174,6 +198,9 @@ class SystemSearchActivity : DuckDuckGoActivity() {
             is ShowAppNotFoundMessage -> {
                 Toast.makeText(this, R.string.systemSearchAppNotFound, LENGTH_SHORT).show()
             }
+            is DismissKeyboard -> {
+                omnibarTextInput.hideKeyboard()
+            }
         }
     }
 
diff --git a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt
index 3cc6b48b392b..635f40200130 100644
--- a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt
@@ -39,7 +39,12 @@ class SystemSearchViewModel(
     private val dispatchers: DispatcherProvider = DefaultDispatcherProvider()
 ) : ViewModel() {
 
-    data class SystemSearchViewState(
+    data class OnboardingViewState(
+        val visibile: Boolean = true,
+        val expanded: Boolean = false
+    )
+
+    data class SystemSearchResultsViewState(
         val queryText: String = "",
         val autocompleteResults: AutoCompleteResult = AutoCompleteResult("", emptyList()),
         val appResults: List<DeviceApp> = emptyList()
@@ -50,9 +55,11 @@ class SystemSearchViewModel(
         data class LaunchBrowser(val query: String) : Command()
         data class LaunchDeviceApplication(val deviceApp: DeviceApp) : Command()
         data class ShowAppNotFoundMessage(val appName: String) : Command()
+        object DismissKeyboard : Command()
     }
 
-    val viewState: MutableLiveData<SystemSearchViewState> = MutableLiveData()
+    val onboardingViewState: MutableLiveData<OnboardingViewState> = MutableLiveData()
+    val resutlsViewState: MutableLiveData<SystemSearchResultsViewState> = MutableLiveData()
     val command: SingleLiveEvent<Command> = SingleLiveEvent()
 
     private val autoCompletePublishSubject = PublishRelay.create<String>()
@@ -63,17 +70,27 @@ class SystemSearchViewModel(
     private var appResults: List<DeviceApp> = emptyList()
 
     init {
-        resetState()
+        resetViewState()
         configureAutoComplete()
     }
 
-    private fun currentViewState(): SystemSearchViewState = viewState.value!!
+    private fun currentOnboardingState(): OnboardingViewState = onboardingViewState.value!!
+    private fun currentResultsState(): SystemSearchResultsViewState = resutlsViewState.value!!
+
+    fun resetViewState() {
+        resetOnboardingState()
+        resetResultsState()
+    }
+
+    private fun resetOnboardingState() {
+        onboardingViewState.value = OnboardingViewState()
+    }
 
-    fun resetState() {
+    private fun resetResultsState() {
         autocompleteResults = AutoCompleteResult("", emptyList())
         appsJob?.cancel()
         appResults = emptyList()
-        viewState.value = SystemSearchViewState()
+        resutlsViewState.value = SystemSearchResultsViewState()
     }
 
     private fun configureAutoComplete() {
@@ -87,13 +104,24 @@ class SystemSearchViewModel(
             }, { t: Throwable? -> Timber.w(t, "Failed to get search results") })
     }
 
+    fun userTappedOnboardingToggle() {
+        onboardingViewState.value = currentOnboardingState().copy(expanded = !currentOnboardingState().expanded)
+        if (currentOnboardingState().expanded) {
+            command.value = Command.DismissKeyboard
+        }
+    }
+
+    fun userDismissedOnboarding() {
+        onboardingViewState.value = currentOnboardingState().copy(visibile = false)
+    }
+
     fun userUpdatedQuery(query: String) {
 
         appsJob?.cancel()
 
         val trimmedQuery = query.trim()
 
-        if (trimmedQuery == currentViewState().queryText) {
+        if (trimmedQuery == currentResultsState().queryText) {
             return
         }
 
@@ -102,7 +130,7 @@ class SystemSearchViewModel(
             return
         }
 
-        viewState.value = currentViewState().copy(queryText = trimmedQuery)
+        resutlsViewState.value = currentResultsState().copy(queryText = trimmedQuery)
         autoCompletePublishSubject.accept(trimmedQuery)
 
         appsJob = viewModelScope.launch(dispatchers.io()) {
@@ -112,22 +140,22 @@ class SystemSearchViewModel(
 
     private fun updateAppResults(results: List<DeviceApp>) {
         appResults = results
-        refreshViewStateResults()
+        refreshResultsViewState()
     }
 
     private fun updateAutocompleteResult(results: AutoCompleteResult) {
         autocompleteResults = results
-        refreshViewStateResults()
+        refreshResultsViewState()
     }
 
-    private fun refreshViewStateResults() {
+    private fun refreshResultsViewState() {
         val hasMultiResults = autocompleteResults.suggestions.isNotEmpty() && appResults.isNotEmpty()
         val fullSuggestions = autocompleteResults.suggestions
         val updatedSuggestions = if (hasMultiResults) fullSuggestions.take(RESULTS_MAX_RESULTS_PER_GROUP) else fullSuggestions
         val updatedApps = if (hasMultiResults) appResults.take(RESULTS_MAX_RESULTS_PER_GROUP) else appResults
 
-        viewState.postValue(
-            currentViewState().copy(
+        resutlsViewState.postValue(
+            currentResultsState().copy(
                 autocompleteResults = AutoCompleteResult(autocompleteResults.query, updatedSuggestions),
                 appResults = updatedApps
             )
@@ -140,7 +168,7 @@ class SystemSearchViewModel(
 
     fun userClearedQuery() {
         autoCompletePublishSubject.accept("")
-        resetState()
+        resetResultsState()
     }
 
     fun userSubmittedQuery(query: String) {
diff --git a/app/src/main/res/drawable/ic_success.xml b/app/src/main/res/drawable/ic_success.xml
new file mode 100644
index 000000000000..d8260c2baa5d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_success.xml
@@ -0,0 +1,29 @@
+<!--
+  ~ Copyright (c) 2020 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M8,0L8,0A8,8 0,0 1,16 8L16,8A8,8 0,0 1,8 16L8,16A8,8 0,0 1,0 8L0,8A8,8 0,0 1,8 0z"
+      android:fillColor="#65BC46"/>
+  <path
+      android:pathData="M11.6752,6.0088L7.0086,10.6755C6.8196,10.8644 6.5133,10.8644 6.3243,10.6755C6.2956,10.6468 6.2712,10.6153 6.2512,10.5819C6.2179,10.5619 6.1864,10.5376 6.1577,10.5088L4.3243,8.6755C4.1354,8.4865 4.1354,8.1802 4.3243,7.9912C4.5133,7.8023 4.8196,7.8023 5.0086,7.9912L6.6665,9.6491L10.991,5.3246C11.1799,5.1356 11.4863,5.1356 11.6752,5.3246C11.8642,5.5135 11.8642,5.8199 11.6752,6.0088Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_system_search.xml b/app/src/main/res/layout/activity_system_search.xml
index 365b3e5233f8..4ec41df79b54 100644
--- a/app/src/main/res/layout/activity_system_search.xml
+++ b/app/src/main/res/layout/activity_system_search.xml
@@ -148,7 +148,7 @@
                 android:paddingBottom="2dp"
                 android:text="@string/systemSearchDeviceAppLabel"
                 android:textColor="@color/grayish"
-                android:textSize="13dp"
+                android:textSize="13sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/autocompleteSuggestions"
diff --git a/app/src/main/res/layout/content_about_duck_duck_go.xml b/app/src/main/res/layout/content_about_duck_duck_go.xml
index de0b60758479..55647d8571d4 100644
--- a/app/src/main/res/layout/content_about_duck_duck_go.xml
+++ b/app/src/main/res/layout/content_about_duck_duck_go.xml
@@ -52,7 +52,7 @@
             android:layout_marginBottom="20dp"
             android:fontFamily="sans-serif"
             android:lineSpacingExtra="6sp"
-            android:text="@string/aboutHeading"
+            android:text="@string/duckDuckGoPrivacySimplified"
             android:textAlignment="center"
             android:textColor="?attr/normalTextColor"
             android:textSize="20sp"
diff --git a/app/src/main/res/layout/include_system_search_onboarding.xml b/app/src/main/res/layout/include_system_search_onboarding.xml
index fc1d807a6533..052b2f564efa 100644
--- a/app/src/main/res/layout/include_system_search_onboarding.xml
+++ b/app/src/main/res/layout/include_system_search_onboarding.xml
@@ -19,7 +19,7 @@
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/onboarding"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="6dp"
@@ -51,13 +51,14 @@
         android:layout_marginBottom="12dp"
         android:fontFamily="sans-serif"
         android:gravity="center"
-        android:text="@string/systemSearchOnboardingTitle"
+        android:text="@string/duckDuckGoPrivacySimplified"
         android:textColor="?attr/normalTextColor"
         android:textSize="16sp"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/onboardingIcon" />
+        app:layout_constraintTop_toBottomOf="@id/onboardingIcon"
+        app:layout_constraintWidth_max="300dp" />
 
     <TextView
         android:id="@+id/onboardingText"
@@ -75,7 +76,74 @@
         android:textStyle="normal"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/onboardingTitle" />
+        app:layout_constraintTop_toBottomOf="@id/onboardingTitle"
+        app:layout_constraintWidth_max="300dp" />
+
+    <LinearLayout
+        android:id="@+id/checkmarks"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="22dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginBottom="12dp"
+        android:orientation="vertical"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="@id/onboardingText"
+        app:layout_constraintStart_toStartOf="@id/onboardingText"
+        app:layout_constraintTop_toBottomOf="@id/onboardingText"
+        tools:visibility="visible">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="6dp"
+            android:fontFamily="sans-serif"
+            android:text="@string/systemSearchOnboaringFeaturesIntroText"
+            android:textColor="?attr/normalTextColor"
+            android:textSize="14sp"
+            android:textStyle="normal" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="6dp"
+            android:drawableStart="@drawable/ic_success"
+            android:drawablePadding="12dp"
+            android:fontFamily="sans-serif"
+            android:text="@string/systemSearchOnboaringFeatureOneText"
+            android:textColor="?attr/normalTextColor"
+            android:textSize="14sp"
+            android:textStyle="normal" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="6dp"
+            android:drawableStart="@drawable/ic_success"
+            android:drawablePadding="12dp"
+            android:fontFamily="sans-serif"
+            android:text="@string/systemSearchOnboaringFeatureTwoText"
+            android:textColor="?attr/normalTextColor"
+            android:textSize="14sp"
+            android:textStyle="normal" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="6dp"
+            android:drawableStart="@drawable/ic_success"
+            android:drawablePadding="12dp"
+            android:fontFamily="sans-serif"
+            android:text="@string/systemSearchOnboaringFeatureThreeText"
+            android:textColor="?attr/normalTextColor"
+            android:textSize="14sp"
+            android:textStyle="normal" />
+    </LinearLayout>
 
     <Button
         android:id="@+id/okButton"
@@ -92,11 +160,12 @@
         android:textSize="13sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/onboardingText" />
+        app:layout_constraintTop_toBottomOf="@id/checkmarks" />
 
     <Button
+        android:id="@+id/toggleButton"
         style="?android:attr/borderlessButtonStyle"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="36dp"
         android:layout_marginStart="12dp"
         android:layout_marginTop="16dp"
@@ -108,7 +177,6 @@
         android:textSize="13sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/okButton"
-        app:layout_constraintTop_toBottomOf="@id/onboardingText" />
-
+        app:layout_constraintTop_toBottomOf="@id/checkmarks" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 8c043c73214b..0c403a014bb3 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -1,6 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="duckDuckGoLogoDescription">Лого на DuckDuckGo</string>
+    <string name="duckDuckGoPrivacySimplified">Поверителност, опростена.</string>
     <string name="yes">да</string>
     <string name="no">Не</string>
 
@@ -175,7 +176,6 @@
 
     <!-- About Activity -->
     <string name="aboutActivityTitle">За нас</string>
-    <string name="aboutHeading">Поверителност, опростена.</string>
     <string name="aboutDescription">
         В DuckDuckGo задаваме новия стандарт на доверие онлайн.\n\ Браузърът за поверителност DuckDuckGo осигурява всички необходими елементи за защита на поверителността, докато търсите и сърфирате в мрежата, включително блокиране на проследяващи елементи, по-интелигентно криптиране и частно търсене с DuckDuckGo.\ n\ В крайна сметка интернет не трябва да създава чувство на страх, а получаването на поверителността, която заслужавате онлайн, трябва да е толкова просто, колкото пускането на щорите.</string>
     <string name="aboutMoreLink">Още на duckduckgo.com/about</string>
@@ -357,4 +357,4 @@
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Бутон за отрицателни отзиви</string>
     <string name="feedbackIsImportantToUs">Вашите анонимни отзиви са важни за нас.</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 464d8259ec2f..3de66e98dc7b 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -1,6 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="duckDuckGoLogoDescription">Logo DuckDuckGo</string>
+    <string name="duckDuckGoPrivacySimplified">Ochrana soukromí, zjednodušená.</string>
     <string name="yes">Ano</string>
     <string name="no">Ne</string>
 
@@ -179,7 +180,6 @@
 
     <!-- About Activity -->
     <string name="aboutActivityTitle">O nás</string>
-    <string name="aboutHeading">Ochrana soukromí, zjednodušená.</string>
     <string name="aboutDescription">
         V DuckDuckGo přinášíme nový standard důvěry online.\n\ DuckDuckGo Privacy Browser poskytuje všechny základní prvky soukromí, které potřebujete k ochraně při vyhledávání a prohlížení webu, včetně blokování sledovacích zařízení, chytřejšího šifrování a soukromého vyhledávání DuckDuckGo.\n\ Internet by v konečném důsledku neměl být tak nebezpečný a získat soukromí, které si zasloužíte online, by mělo být stejně jednoduché jako zatáhnout žaluzie.</string>
     <string name="aboutMoreLink">Více na duckduckgo.com/about</string>
@@ -361,4 +361,4 @@
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Tlačítko negativní zpětné vazby</string>
     <string name="feedbackIsImportantToUs">Vaše anonymní zpětná vazba je pro nás důležitá.</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 5470c833c5da..342dc696dc8e 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -1,6 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="duckDuckGoLogoDescription">DuckDuckGo-logo</string>
+    <string name="duckDuckGoPrivacySimplified">Privatlivets fred, forenklet.</string>
     <string name="yes">Ja</string>
     <string name="no">Nej</string>
 
@@ -175,7 +176,6 @@
 
     <!-- About Activity -->
     <string name="aboutActivityTitle">Om os</string>
-    <string name="aboutHeading">Privatlivets fred, forenklet.</string>
     <string name="aboutDescription">
         Hos DuckDuckGo sætter vi den nye standard for tiltro online .\n\ DuckDuckGo Privacy Browser giver dig alle de nødvendige værktøjer til at værne over privatlivets fred, så du kan beskytte dig selv, når du søger og surfer på nettet, herunder tracker-blokering, smartere kryptering og DuckDuckGo-privat søgning.\n\ Internettet bør trods alt ikke føles så skummelt, og det bør være lige så enkelt at få det privatliv, du fortjener online, som at lukke dine persienner ned.</string>
     <string name="aboutMoreLink">Mere på duckduckgo.com/about</string>
@@ -357,4 +357,4 @@
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Knap til negativ feedback</string>
     <string name="feedbackIsImportantToUs">Din anonyme feedback er vigtig for os.</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index bb8e93b86a6a..ade28f0d0a9b 100755
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,6 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="duckDuckGoLogoDescription">DuckDuckGo-Logo</string>
+    <string name="duckDuckGoPrivacySimplified">Datenschutz – leicht gemacht.</string>
     <string name="yes">Ja</string>
     <string name="no">Nein</string>
 
@@ -175,7 +176,6 @@
 
     <!-- About Activity -->
     <string name="aboutActivityTitle">Über uns</string>
-    <string name="aboutHeading">Datenschutz – leicht gemacht.</string>
     <string name="aboutDescription">
         Wir bei DuckDuckGo setzen den neuen Standard für Vertrauen im Internet.\n\ Der DuckDuckGo Privacy Browser bietet alle Datenschutzgrundlagen, die du benötigst, um dich beim Suchen und Browsen im Internet zu schützen, einschließlich Tracker-Blockierung, intelligentere Verschlüsselung und DuckDuckGo-Privatmodussuche.\n\ Schließlich muss das Internet kein unheimlicher Ort sein und die Online-Privatsphäre zu bekommen, die du verdienst, sollte so einfach sein wie das Zuziehen deiner Vorhänge.</string>
     <string name="aboutMoreLink">Mehr auf duckduckgo.com/about</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 9385cdc16ebe..339537bc20b3 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -1,6 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="duckDuckGoLogoDescription">Λογότυπο DuckDuckGo</string>
+    <string name="duckDuckGoPrivacySimplified">Ιδιωτικότητα, απλοποιημένη.</string>
     <string name="yes">Ναι</string>
     <string name="no">Οχι</string>
 
@@ -175,7 +176,6 @@
 
     <!-- About Activity -->
     <string name="aboutActivityTitle">Πληροφορίες για εμάς</string>
-    <string name="aboutHeading">Ιδιωτικότητα, απλοποιημένη.</string>
     <string name="aboutDescription">
         Στην DuckDuckGo θέτουμε το νέο πρότυπο εμπιστοσύνης στο διαδίκτυο.\n\Το πρόγραμμα περιήγησης ιδιωτικότητας DuckDuckGo παρέχει όλα τα απαραίτητα στοιχεία ιδιωτικότητας που χρειάζεστε για να προστατεύσετε τον εαυτό σας κατά την αναζήτηση και περιήγηση στο διαδίκτυο, συμπεριλαμβανομένου του αποκλεισμού παρακολούθησης, πιο έξυπνης κρυπτογράφησης και ιδιωτικής αναζήτησης DuckDuckGo.\n\ Άλλωστε, στο διαδίκτυο δεν θα πρέπει να αισθάνεστε άβολα και το να απολαμβάνετε την ιδιωτικότητα που σας αξίζει στο διαδίκτυο θα πρέπει να είναι τόσο απλό όσο το κλείσιμο μιας πόρτας.</string>
     <string name="aboutMoreLink">Περισσότερα στη διεύθυνση duckduckgo.com/about</string>
@@ -357,4 +357,4 @@
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Κουμπί αρνητικών σχολίων</string>
     <string name="feedbackIsImportantToUs">Τα ανώνυμα σχόλιά σας είναι σημαντικά για εμάς.</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index b6cc32381e8c..c6afb0226d70 100755
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,6 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="duckDuckGoLogoDescription">Logotipo de DuckDuckGo</string>
+    <string name="duckDuckGoPrivacySimplified">La privacidad, simplificada.</string>
     <string name="yes">Si</string>
     <string name="no">No</string>
 
@@ -175,7 +176,6 @@
 
     <!-- About Activity -->
     <string name="aboutActivityTitle">Acerca de nosotros</string>
-    <string name="aboutHeading">La privacidad, simplificada.</string>
     <string name="aboutDescription">
         En DuckDuckGo, estamos sentando un precedente en la confianza en línea.\n\ El navegador privado de DuckDuckGo ofrece todas las funciones de privacidad esenciales que necesitas para protegerte mientras realizas búsquedas y navegas en Internet, lo que incluye el bloqueo de rastreadores, cifrado inteligente y búsqueda privada de DuckDuckGo.\n\ Después de todo, Internet no debería percibirse como una amenaza y disfrutar de la privacidad en línea que mereces debería ser lo más fácil posible.</string>
     <string name="aboutMoreLink">Más información en duckduckgo.com/about</string>
@@ -357,4 +357,4 @@
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Botón de opinión negativa</string>
     <string name="feedbackIsImportantToUs">Tu opinión anónima nos importa.</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 1f95ea90a1c6..bfad98f739d7 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -1,6 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="duckDuckGoLogoDescription">DuckDuckGo-logo</string>
+    <string name="duckDuckGoPrivacySimplified">Tietosuojaa, yksinkertaisesti.</string>
     <string name="yes">Joo</string>
     <string name="no">Ei</string>
 
@@ -175,7 +176,6 @@
 
     <!-- About Activity -->
     <string name="aboutActivityTitle">Tietoa meistä</string>
-    <string name="aboutHeading">Tietosuojaa, yksinkertaisesti.</string>
     <string name="aboutDescription">
         DuckDuckGo asettaa uudet standardit luottamukselle verkossa.\n\ DuckDuckGo-tietosuojaselain tarjoaa kaikki keskeiset tietosuojaominaisuudet nettihakujesi ja -selailusi turvaksi, kuten seurantapalvelinten eston, älykkäämmän salauksen ja yksityisen DuckDuckGo-haun.\n\ Internetin ei pitäisi tuntua karmivalta paikalta ja haluamasi nettiyksityisyyden pitäisi järjestyä sulkemalla verhot.</string>
     <string name="aboutMoreLink">Lisätietoa: duckduckgo.com/about</string>
@@ -357,4 +357,4 @@
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Negatiivinen palaute -painike</string>
     <string name="feedbackIsImportantToUs">Anonyymi palautteesi on meille tärkeää.</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 86cfe6072173..28f11b9cc21f 100755
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,6 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="duckDuckGoLogoDescription">Logo DuckDuckGo</string>
+    <string name="duckDuckGoPrivacySimplified">Le respect de votre vie privée, simplifié.</string>
     <string name="yes">Oui</string>
     <string name="no">Non</string>
 
@@ -175,7 +176,6 @@
 
     <!-- About Activity -->
     <string name="aboutActivityTitle">À propos de nous</string>
-    <string name="aboutHeading">Le respect de votre vie privée, simplifié.</string>
     <string name="aboutDescription">
         Chez DuckDuckGo, nous établissons la nouvelle norme de confiance en ligne. \n\ Le navigateur de confidentialité DuckDuckGo fournit tous les éléments de confidentialité essentiels dont vous avez besoin pour vous protéger lorsque vous faites des recherches et naviguez sur le Web, notamment le blocage des trackers, le chiffrement plus intelligent et la recherche privée DuckDuckGo.\n\ Après tout, Internet ne devrait pas être aussi effrayant, et obtenir la confidentialité que vous méritez en ligne devrait être aussi simple que de fermer les stores.</string>
     <string name="aboutMoreLink">Pour en savoir plus, visitez duckduckgo.com/about</string>
@@ -357,4 +357,4 @@
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Bouton de commentaires négatifs</string>
     <string name="feedbackIsImportantToUs">Vos commentaires anonymes sont importants pour nous.</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index e4305c0a50dd..cd6874dcdfff 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1,6 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="duckDuckGoLogoDescription">Logotip DuckDuckGo</string>
+    <string name="duckDuckGoPrivacySimplified">Zaštita privatnosti, pojednostavljeno.</string>
     <string name="yes">Da</string>
     <string name="no">Ne</string>
 
@@ -175,7 +176,6 @@
 
     <!-- About Activity -->
     <string name="aboutActivityTitle">O nama</string>
-    <string name="aboutHeading">Zaštita privatnosti, pojednostavljeno.</string>
     <string name="aboutDescription">
         U DuckDuckGo postavljamo novi standard povjerenja na mreži.\n\ DuckDuckGo anonimni preglednik pruža sve što vam je potrebno da se zaštitite dok pretražujete i pregledavate internet, uključujući blokiranje alata za praćenje, pametnije šifriranje i privatno pretraživanje DuckDuckGo.\n\ Uostalom, internet ne bi trebao biti jezivo mjesto, a dobivanje privatnosti koju zaslužujete na internetu trebalo bi biti jednostavno poput spuštanja roleta.</string>
     <string name="aboutMoreLink">Više na duckduckgo.com/about</string>
@@ -357,4 +357,4 @@
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Gumb za negativne povratne informacije</string>
     <string name="feedbackIsImportantToUs">Vaše anonimne povratne informacije su važne za nas.</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 9643c5f2ef3e..8126bb03baef 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -1,6 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="duckDuckGoLogoDescription">DuckDuckGo logó</string>
+    <string name="duckDuckGoPrivacySimplified">Adatvédelem, egyszerűsítve.</string>
     <string name="yes">Igen</string>
     <string name="no">Nem</string>
 
@@ -175,7 +176,6 @@
 
     <!-- About Activity -->
     <string name="aboutActivityTitle">Rólunk</string>
-    <string name="aboutHeading">Adatvédelem, egyszerűsítve.</string>
     <string name="aboutDescription">
         A DuckDuckGo célja egy új online bizalmi szint megteremtése. \n\ A DuckDuckGo Adatvédelmi Böngésző minden olyan alapvető adatvédelmi elemet tartalmaz, amelyre szükséged lehet ahhoz, hogy megvédd magad az internetes keresés és böngészés során, beleértve a nyomkövető letiltását, az intelligensebb titkosítást és a DuckDuckGo privát keresést.\n\ Az internet végső soron nem feltétlenül kell, hogy ellenséges közeg legyen, és hisszük, hogy az általad megérdemelt adatvédelem olyan egyszerű is lehet, mint a redőny lehúzása.</string>
     <string name="aboutMoreLink">További információk a duckduckgo.com/about oldalon</string>
@@ -357,4 +357,4 @@
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Negatív visszajelzés gomb</string>
     <string name="feedbackIsImportantToUs">Anonim visszajelzésed fontos számunkra.</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 7036e9469995..c62cd3fceb6e 100755
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -17,6 +17,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="duckDuckGoLogoDescription">Logo DuckDuckGo</string>
+    <string name="duckDuckGoPrivacySimplified">La privacy, semplificata.</string>
     <string name="yes">Sì</string>
     <string name="no">No</string>
 
@@ -191,7 +192,6 @@
 
     <!-- About Activity -->
     <string name="aboutActivityTitle">Chi siamo</string>
-    <string name="aboutHeading">La privacy, semplificata.</string>
     <string name="aboutDescription">
         DuckDuckGo è il nuovo standard di sicurezza online.\n\Il browser per la navigazione anonima DuckDuckGo ti fornisce tutti gli strumenti di privacy di cui hai bisogno per proteggerti mentre navighi ed effettui ricerche online. Inoltre, blocca i sistemi di tracciamento, offre una crittografia intelligente e ti permette di effettuare ricerche private.\n\ Dopotutto, Internet non deve essere un luogo da temere e avere online la privacy che meriti dovrebbe essere davvero facile.</string>
     <string name="aboutMoreLink">Scopri di più su duckduckgo.com/about</string>
@@ -373,4 +373,4 @@
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Pulsante feedback negativo</string>
     <string name="feedbackIsImportantToUs">Il tuo feedback anonimo è importante per noi.</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index c99cc444895d..6124513c4f76 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -1,6 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="duckDuckGoLogoDescription">„DuckDuckGo“ logotipas</string>
+    <string name="duckDuckGoPrivacySimplified">Supaprastintas privatumas.</string>
     <string name="yes">Taip</string>
     <string name="no">Ne</string>
 
@@ -179,7 +180,6 @@
 
     <!-- About Activity -->
     <string name="aboutActivityTitle">Apie mus</string>
-    <string name="aboutHeading">Supaprastintas privatumas.</string>
     <string name="aboutDescription">
         „DuckDuckGo“ nustatome naują patikimumo tinkle standartą.\n\„DuckDuckGo“ privatumo naršyklė užtikrina visus svarbiausius įrankius, kurie padės apsaugoti savo privatumą ieškant ir naršant tinkle, įskaitant sekiklių blokavimą, išmanųjį šifravimą ir „DuckDuckGo“ privačias paieškas.\n\ Mūsų komanda tiki, kad internetas neturėtų būti toks baisus, o privatumas, kurio nusipelnėte internete, turėtų būti ranka pasiekiamas.</string>
     <string name="aboutMoreLink">Daugiau informacijos rasite duckdukgo.com/about</string>
@@ -361,4 +361,4 @@
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Neigiamų atsiliepimų mygtukas</string>
     <string name="feedbackIsImportantToUs">Jūsų anoniminiai atsiliepimai mums labai svarbūs.</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 554f720966fc..7a7aea019af8 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -1,6 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="duckDuckGoLogoDescription">DuckDuckGo logo</string>
+    <string name="duckDuckGoPrivacySimplified">Personvern gjort enkelt.</string>
     <string name="yes">Ja</string>
     <string name="no">Nei</string>
 
@@ -175,7 +176,6 @@
 
     <!-- About Activity -->
     <string name="aboutActivityTitle">Om oss</string>
-    <string name="aboutHeading">Personvern gjort enkelt.</string>
     <string name="aboutDescription">
         Hos DucDuckGo setter vi den nye standarden for pålitelighet på nettet.\n\ DuckDuckGos private nettleser gir deg alle de grunnleggende personvernfunksjonene du trenger for å beskytte deg selv mens du søker og surfer på nettet, inkludert sporingsblokkering, smartere kryptering og DuckDuckGos private søk.\n\ Når det kommer til stykket, burde det ikke være så guffent å bruke Internett. Det skal ikke være vanskeligere å få det personvernet du fortjener på nett enn å velge gardiner.</string>
     <string name="aboutMoreLink">Mer på duckduckgo.com/about</string>
@@ -357,4 +357,4 @@
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Knapp for negativ tilbakemelding</string>
     <string name="feedbackIsImportantToUs">Den anonyme tilbakemeldingen din er viktig for oss.</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 466d2cfbd8bd..3fd2eaf04d4a 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,6 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="duckDuckGoLogoDescription">Logo DuckDuckGo</string>
+    <string name="duckDuckGoPrivacySimplified">Privacy, vereenvoudigd.</string>
     <string name="yes">Ja</string>
     <string name="no">Nee</string>
 
@@ -175,7 +176,6 @@
 
     <!-- About Activity -->
     <string name="aboutActivityTitle">Over ons</string>
-    <string name="aboutHeading">Privacy, vereenvoudigd.</string>
     <string name="aboutDescription">
         Bij DuckDuckGo zetten we de nieuwe standaard voor vertrouwen online.\ n\ DuckDuckGo Privacy Browser biedt alle privacy-essentials die je nodig hebt om jezelf te beschermen tijdens het zoeken en browsen op het internet, inclusief trackerblokkering, slimmere codering en DuckDuckGo privé-zoekopdrachten.\ n\ Het internet zou namelijk helemaal niet zo griezelig moeten zijn en de privacy die je online verdient, moet net zo eenvoudig zijn als het sluiten van de gordijnen.</string>
     <string name="aboutMoreLink">Meer informatie op duckduckgo.com/about</string>
@@ -357,4 +357,4 @@
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Knop negatieve feedback</string>
     <string name="feedbackIsImportantToUs">Jouw anonieme feedback is belangrijk voor ons.</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 9b388a34a34e..0b731b45a380 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,6 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="duckDuckGoLogoDescription">Logo DuckDuckGo</string>
+    <string name="duckDuckGoPrivacySimplified">Prywatność uproszczona.</string>
     <string name="yes">Tak</string>
     <string name="no">Nie</string>
 
@@ -183,7 +184,6 @@
 
     <!-- About Activity -->
     <string name="aboutActivityTitle">O nas</string>
-    <string name="aboutHeading">Prywatność uproszczona.</string>
     <string name="aboutDescription">
         DuckDuckGo ustanawia nowy standard zaufania w sieci. Przeglądarka DuckDuckGo Privacy Browser zapewnia wszelkie rozwiązania w zakresie prywatności, które pozwalają użytkownikowi zapewnić sobie ochronę podczas wyszukiwania stron i przeglądania sieci, w tym blokowanie skryptów śledzących, inteligentniejsze szyfrowanie, a także prywatne wyszukiwanie DuckDuckGo. Przecież w Internecie nie wszystko powinno być widoczne, a uzyskanie niezbędnej prywatności powinno być tak proste jak zasunięcie rolety.</string>
     <string name="aboutMoreLink">Więcej informacji: duckduckgo.com/about</string>
@@ -365,4 +365,4 @@
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Przycisk negatywnej opinii</string>
     <string name="feedbackIsImportantToUs">Twoja anonimowa opinia ma dla nas ogromne znaczenie.</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 05e108dfbc9c..46ed2ce5b1f3 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1,6 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="duckDuckGoLogoDescription">Logótipo do DuckDuckGo</string>
+    <string name="duckDuckGoPrivacySimplified">Privacidade, simplificada.</string>
     <string name="yes">Sim</string>
     <string name="no">Não</string>
 
@@ -175,7 +176,6 @@
 
     <!-- About Activity -->
     <string name="aboutActivityTitle">Sobre nós</string>
-    <string name="aboutHeading">Privacidade, simplificada.</string>
     <string name="aboutDescription">
         No DuckDuckGo, estamos a definir o novo padrão de confiança online.\n\ O Navegador de Privacidade DuckDuckGo fornece todos os elementos essenciais de privacidade de que necessita para se proteger enquanto pesquisa e navega na Web, incluindo bloqueio de rastreadores, encriptação mais inteligente e pesquisa privada DuckDuckGo.\n\ Afinal de contas, a Internet não deve ser tão assustadora, e obter a privacidade que merece online deve ser tão simples como fechar as persianas.</string>
     <string name="aboutMoreLink">Mais em duckduckgo.com/about</string>
@@ -357,4 +357,4 @@
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Botão de comentário negativo</string>
     <string name="feedbackIsImportantToUs">Os seus comentários anónimos são importantes para nós.</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index c62fa960a5e4..ba9e65f67a22 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -1,6 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="duckDuckGoLogoDescription">Logoul DuckDuckGo</string>
+    <string name="duckDuckGoPrivacySimplified">Despre confidențialitate, pe scurt.</string>
     <string name="yes">Da</string>
     <string name="no">Nu</string>
 
@@ -179,7 +180,6 @@
 
     <!-- About Activity -->
     <string name="aboutActivityTitle">Despre noi</string>
-    <string name="aboutHeading">Despre confidențialitate, pe scurt.</string>
     <string name="aboutDescription">
         Aici, la DuckDuckGo, stabilim noul standard de încredere online.\n\ DuckDuckGo Privacy Browser oferă toate elementele esențiale de confidențialitate de care aveți nevoie pentru a vă proteja în timp ce căutați și navigați pe web, inclusiv blocarea cookie-urilor de urmărire, criptare mai inteligentă și căutare privată DuckDuckGo.\n\ La urma urmei, internetul nu ar trebui să fie perceput atât de ciudat, iar obținerea confidențialității pe care o meritați online ar trebui să fie la fel de simplă ca a trage perdeaua.</string>
     <string name="aboutMoreLink">Aflați mai multe la duckduckgo.com/about</string>
@@ -361,4 +361,4 @@
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Buton feedback negativ</string>
     <string name="feedbackIsImportantToUs">Feedbackul dvs. anonim este important pentru noi.</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index f5b21930716f..1a917ed0a2ea 100755
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -17,6 +17,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="duckDuckGoLogoDescription">Логотип DuckDuckGo</string>
+    <string name="duckDuckGoPrivacySimplified">Максимум конфиденциальности, минимум усилий.</string>
     <string name="yes">Да</string>
     <string name="no">Нет</string>
 
@@ -199,7 +200,6 @@
 
     <!-- About Activity -->
     <string name="aboutActivityTitle">Информация о нас</string>
-    <string name="aboutHeading">Максимум конфиденциальности, минимум усилий.</string>
     <string name="aboutDescription">DuckDuckGo устанавливает новый стандарт доверия в сети Интернет.\n\ Веб-браузер DuckDuckGo предоставляет все функции обеспечения конфиденциальности, необходимые для защиты ваших данных во время поиска и навигации в Интернете, в том числе функцию блокировки отслеживающих программ (трекеров), более сложное шифрование и конфиденциальный поиск DuckDuckGo.\n\ В конце концов, Интернет не должен пугать и вызывать негативные эмоции, а обеспечить конфиденциальность в Интернете, которую вы заслуживаете, должно быть так же просто, как закрыть шторы.</string>
     <string name="aboutMoreLink">Больше информации см. по адресу https://duckduckgo.com/about</string>
     <string name="no_suggestions">Нет предложений</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index dbb8d9fd3fb7..266575c89991 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -1,6 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="duckDuckGoLogoDescription">Logo DuckDuckGo</string>
+    <string name="duckDuckGoPrivacySimplified">Súkromie jednoducho.</string>
     <string name="yes">Áno</string>
     <string name="no">žiadny</string>
 
@@ -176,7 +177,6 @@
 
     <!-- About Activity -->
     <string name="aboutActivityTitle">O nás</string>
-    <string name="aboutHeading">Súkromie jednoducho.</string>
     <string name="aboutDescription">
         V DuckDuckGo nastavujeme nový štandard dôvery online.\n\ DuckDuckGo, prehliadač s dôrazom na súkromie, ponúka všetky dôležité základné prvky ochrany súkromia na ochranu pri vyhľadávaní a prehliadaní webu, vrátane blokovania sledovacích zariadení, inteligentnejšieho šifrovania a súkromného vyhľadávania DuckDuckGo.\n\ Pri používaní internetu by sme predsa nemali mať zlý pocit a dopriať si zaslúžené online súkromie by nemalo byť o nič ťažšie ako jednoduché zatiahnutie rolety.</string>
     <string name="aboutMoreLink">Viac informácií na stránke duckduckgo.com/about</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 43077ba009ba..8dc124338c54 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -1,6 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="duckDuckGoLogoDescription">Logotip DuckDuckGo</string>
+    <string name="duckDuckGoPrivacySimplified">Poenostavljena zasebnost.</string>
     <string name="yes">Da</string>
     <string name="no">Ne</string>
 
@@ -183,7 +184,6 @@
 
     <!-- About Activity -->
     <string name="aboutActivityTitle">O nas</string>
-    <string name="aboutHeading">Poenostavljena zasebnost.</string>
     <string name="aboutDescription">
         Pri DuckDuckGo vzpostavljamo nov standard zaupanja na spletu.\n\ Zasebni brskalnik DuckDuckGo zagotavlja vse bistvene sestavine zasebnosti, ki jih potrebujete za svojo zaščito, kadar iščete in brskate po spletu, vključno z blokiranjem sledilnikov, pametnejšim šifriranjem in zasebnim iskanjem DuckDuckGo.\n\ Navsezadnje nam internet ne bi smel vzbujati strahu. Doseganje zasebnosti na spletu, ki si jo zaslužimo, bi moralo biti tako preprosto kot zagrinjanje zaves.</string>
     <string name="aboutMoreLink">Več na duckduckgo.com/about</string>
@@ -365,4 +365,4 @@
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Gumb Negativne povratne informacije</string>
     <string name="feedbackIsImportantToUs">Vaše anonimne povratne informacije so nam pomembne.</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index c60cc2ec4bda..6728119ee312 100755
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -17,6 +17,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="duckDuckGoLogoDescription">DuckDuckGos logotyp</string>
+    <string name="duckDuckGoPrivacySimplified">Förenklad sekretessförklaring.</string>
     <string name="yes">Ja</string>
     <string name="no">Nej</string>
 
@@ -191,7 +192,6 @@
 
     <!-- About Activity -->
     <string name="aboutActivityTitle">Om oss</string>
-    <string name="aboutHeading">Förenklad sekretessförklaring.</string>
     <string name="aboutDescription">
         På DuckDuckGo höjer vi kraven för förtroende online.\n\ DuckDuckGo Privacy Browser tillhandahåller alla nödvändiga sekretessvillkor som du behöver för att skydda dig själv när du söker och surfar på nätet, inklusive blockering av spårare, smartare kryptering och DuckDuckGo privat sökning.\ n\ Internet borde ju trots allt inte kännas obehagligt och att få den sekretess du förtjänar online bör vara lika enkelt som att stänga persiennerna.</string>
     <string name="aboutMoreLink">Mer på duckduckgo.com/about</string>
@@ -373,4 +373,4 @@
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Knappen för negativ återkoppling</string>
     <string name="feedbackIsImportantToUs">Din anonyma återkoppling är viktig för oss.</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/string-untranslated.xml b/app/src/main/res/values/string-untranslated.xml
index 1ca1965ef858..9fdfd4b1c7f8 100644
--- a/app/src/main/res/values/string-untranslated.xml
+++ b/app/src/main/res/values/string-untranslated.xml
@@ -22,8 +22,12 @@
     <string name="systemSearchDeviceAppLabel">From this device</string>
     <string name="systemSearchAppNotFound">Application could not be found</string>
     <string name="systemSearchOnboardingText">Thanks for choosing DuckDuckGo!\nNow, when using our search or app, your searches are protected.</string>
-    <string name="systemSearchOnboardingTitle">Privacy, simplified</string>
+    <string name="systemSearchOnboaringFeaturesIntroText">The DuckDuckGo app also:</string>
+    <string name="systemSearchOnboaringFeatureOneText">Blocks unsafe trackers</string>
+    <string name="systemSearchOnboaringFeatureTwoText">Forces encryption on websites</string>
+    <string name="systemSearchOnboaringFeatureThreeText">Clears data with one tap</string>
     <string name="systemSearchOnboardingButtonMore">Show more</string>
+    <string name="systemSearchOnboardingButtonLess">Hide</string>
     <string name="systemSearchOnboardingButtonOk">Got it</string>
 
     <!-- New Onboarding Experience -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index afe9846610c7..01a3bcb59201 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,8 +1,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="appName" translatable="false">DuckDuckGo</string>
-    <string name="duckDuckGoLogoDescription">DuckDuckGo logo</string>
     <string name="appDescription" translatable="false">DuckDuckGo&#160;</string>
+    <string name="duckDuckGoLogoDescription">DuckDuckGo logo</string>
+    <string name="duckDuckGoPrivacySimplified">Privacy, simplified.</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
 
@@ -180,7 +181,6 @@
 
     <!-- About Activity -->
     <string name="aboutActivityTitle">About us</string>
-    <string name="aboutHeading">Privacy, simplified.</string>
     <string name="aboutDescription">
         At DuckDuckGo, we\'re setting the new standard of trust online.\n\
         DuckDuckGo Privacy Browser provides all the privacy essentials you need to protect yourself as you search and browse the web, including tracker blocking, smarter encryption, and DuckDuckGo private search.\n\

From 8426f7a483e4525a5ac67af7a5f983f1799984b7 Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Tue, 3 Mar 2020 20:15:51 +0000
Subject: [PATCH 03/20] Design feedback

---
 .../main/res/layout/include_system_search_onboarding.xml    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/include_system_search_onboarding.xml b/app/src/main/res/layout/include_system_search_onboarding.xml
index 052b2f564efa..d44672b5ede1 100644
--- a/app/src/main/res/layout/include_system_search_onboarding.xml
+++ b/app/src/main/res/layout/include_system_search_onboarding.xml
@@ -84,7 +84,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
-        android:layout_marginTop="22dp"
+        android:layout_marginTop="10dp"
         android:layout_marginEnd="12dp"
         android:layout_marginBottom="12dp"
         android:orientation="vertical"
@@ -151,7 +151,7 @@
         android:layout_width="0dp"
         android:layout_height="36dp"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="12dp"
         android:layout_marginEnd="12dp"
         android:layout_marginBottom="16dp"
         android:foreground="?attr/selectableItemBackgroundBorderless"
@@ -168,7 +168,7 @@
         android:layout_width="wrap_content"
         android:layout_height="36dp"
         android:layout_marginStart="12dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="12dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="16dp"
         android:foreground="?attr/selectableItemBackgroundBorderless"

From de4f8dee52be35d87291383c98a4c316410c9a14 Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Wed, 4 Mar 2020 11:59:11 +0000
Subject: [PATCH 04/20] Add landscape layout

---
 .../app/systemsearch/SystemSearchActivity.kt  |   1 +
 .../include_system_search_onboarding.xml      |  79 +++++++++++
 .../include_system_search_onboarding.xml      | 101 +-------------
 ...clude_system_search_onboarding_content.xml | 127 ++++++++++++++++++
 4 files changed, 208 insertions(+), 100 deletions(-)
 create mode 100644 app/src/main/res/layout-land/include_system_search_onboarding.xml
 create mode 100644 app/src/main/res/layout/include_system_search_onboarding_content.xml

diff --git a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
index ddbd4cf7abdf..935718f8e3af 100644
--- a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
@@ -43,6 +43,7 @@ import com.duckduckgo.app.systemsearch.SystemSearchViewModel.Command.*
 import com.duckduckgo.app.systemsearch.SystemSearchViewModel.SystemSearchResultsViewState
 import kotlinx.android.synthetic.main.activity_system_search.*
 import kotlinx.android.synthetic.main.include_system_search_onboarding.*
+import kotlinx.android.synthetic.main.include_system_search_onboarding_content.*
 import javax.inject.Inject
 
 class SystemSearchActivity : DuckDuckGoActivity() {
diff --git a/app/src/main/res/layout-land/include_system_search_onboarding.xml b/app/src/main/res/layout-land/include_system_search_onboarding.xml
new file mode 100644
index 000000000000..8cec9690251f
--- /dev/null
+++ b/app/src/main/res/layout-land/include_system_search_onboarding.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+
+<!--
+  ~ Copyright (c) 2018 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/colorPrimary"
+    android:elevation="2dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/onboardingIcon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/interstitial_high_five"
+        app:layout_constraintBottom_toBottomOf="@+id/onboardingText"
+        app:layout_constraintEnd_toStartOf="@+id/onboardingText"
+        app:layout_constraintHorizontal_bias="0.75"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/onboardingText" />
+
+    <TextView
+        android:id="@+id/onboardingTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:layout_marginBottom="12dp"
+        android:fontFamily="sans-serif"
+        android:gravity="center"
+        android:text="@string/duckDuckGoPrivacySimplified"
+        android:textColor="?attr/normalTextColor"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/onboardingText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:layout_marginBottom="12dp"
+        android:fontFamily="sans-serif"
+        android:gravity="center"
+        android:text="@string/systemSearchOnboardingText"
+        android:textColor="?attr/normalTextColor"
+        android:textSize="16sp"
+        android:textStyle="normal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/onboardingIcon"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/onboardingTitle"
+        app:layout_constraintWidth_max="300dp" />
+
+    <include layout="@layout/include_system_search_onboarding_content" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_system_search_onboarding.xml b/app/src/main/res/layout/include_system_search_onboarding.xml
index d44672b5ede1..b9884dc2c196 100644
--- a/app/src/main/res/layout/include_system_search_onboarding.xml
+++ b/app/src/main/res/layout/include_system_search_onboarding.xml
@@ -19,7 +19,6 @@
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="6dp"
@@ -79,104 +78,6 @@
         app:layout_constraintTop_toBottomOf="@id/onboardingTitle"
         app:layout_constraintWidth_max="300dp" />
 
-    <LinearLayout
-        android:id="@+id/checkmarks"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="12dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="12dp"
-        android:layout_marginBottom="12dp"
-        android:orientation="vertical"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="@id/onboardingText"
-        app:layout_constraintStart_toStartOf="@id/onboardingText"
-        app:layout_constraintTop_toBottomOf="@id/onboardingText"
-        tools:visibility="visible">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:layout_marginBottom="6dp"
-            android:fontFamily="sans-serif"
-            android:text="@string/systemSearchOnboaringFeaturesIntroText"
-            android:textColor="?attr/normalTextColor"
-            android:textSize="14sp"
-            android:textStyle="normal" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:layout_marginBottom="6dp"
-            android:drawableStart="@drawable/ic_success"
-            android:drawablePadding="12dp"
-            android:fontFamily="sans-serif"
-            android:text="@string/systemSearchOnboaringFeatureOneText"
-            android:textColor="?attr/normalTextColor"
-            android:textSize="14sp"
-            android:textStyle="normal" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:layout_marginBottom="6dp"
-            android:drawableStart="@drawable/ic_success"
-            android:drawablePadding="12dp"
-            android:fontFamily="sans-serif"
-            android:text="@string/systemSearchOnboaringFeatureTwoText"
-            android:textColor="?attr/normalTextColor"
-            android:textSize="14sp"
-            android:textStyle="normal" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:layout_marginBottom="6dp"
-            android:drawableStart="@drawable/ic_success"
-            android:drawablePadding="12dp"
-            android:fontFamily="sans-serif"
-            android:text="@string/systemSearchOnboaringFeatureThreeText"
-            android:textColor="?attr/normalTextColor"
-            android:textSize="14sp"
-            android:textStyle="normal" />
-    </LinearLayout>
-
-    <Button
-        android:id="@+id/okButton"
-        style="?android:attr/borderlessButtonStyle"
-        android:layout_width="0dp"
-        android:layout_height="36dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginEnd="12dp"
-        android:layout_marginBottom="16dp"
-        android:foreground="?attr/selectableItemBackgroundBorderless"
-        android:text="@string/systemSearchOnboardingButtonOk"
-        android:textColor="@color/cornflowerBlue"
-        android:textSize="13sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/checkmarks" />
-
-    <Button
-        android:id="@+id/toggleButton"
-        style="?android:attr/borderlessButtonStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="36dp"
-        android:layout_marginStart="12dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="16dp"
-        android:foreground="?attr/selectableItemBackgroundBorderless"
-        android:text="@string/systemSearchOnboardingButtonMore"
-        android:textColor="@color/cornflowerBlue"
-        android:textSize="13sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/okButton"
-        app:layout_constraintTop_toBottomOf="@id/checkmarks" />
+    <include layout="@layout/include_system_search_onboarding_content"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_system_search_onboarding_content.xml b/app/src/main/res/layout/include_system_search_onboarding_content.xml
new file mode 100644
index 000000000000..6492d5d780a0
--- /dev/null
+++ b/app/src/main/res/layout/include_system_search_onboarding_content.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+
+<!--
+  ~ Copyright (c) 2018 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.duckduckgo.app.systemsearch.SystemSearchActivity"
+    tools:showIn="@layout/include_system_search_onboarding">
+
+    <LinearLayout
+        android:id="@+id/checkmarks"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginBottom="12dp"
+        android:orientation="vertical"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="@id/onboardingText"
+        app:layout_constraintStart_toStartOf="@id/onboardingText"
+        app:layout_constraintTop_toBottomOf="@id/onboardingText"
+        tools:visibility="visible">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="6dp"
+            android:fontFamily="sans-serif"
+            android:text="@string/systemSearchOnboaringFeaturesIntroText"
+            android:textColor="?attr/normalTextColor"
+            android:textSize="14sp"
+            android:textStyle="normal" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="6dp"
+            android:drawableStart="@drawable/ic_success"
+            android:drawablePadding="12dp"
+            android:fontFamily="sans-serif"
+            android:text="@string/systemSearchOnboaringFeatureOneText"
+            android:textColor="?attr/normalTextColor"
+            android:textSize="14sp"
+            android:textStyle="normal" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="6dp"
+            android:drawableStart="@drawable/ic_success"
+            android:drawablePadding="12dp"
+            android:fontFamily="sans-serif"
+            android:text="@string/systemSearchOnboaringFeatureTwoText"
+            android:textColor="?attr/normalTextColor"
+            android:textSize="14sp"
+            android:textStyle="normal" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="6dp"
+            android:drawableStart="@drawable/ic_success"
+            android:drawablePadding="12dp"
+            android:fontFamily="sans-serif"
+            android:text="@string/systemSearchOnboaringFeatureThreeText"
+            android:textColor="?attr/normalTextColor"
+            android:textSize="14sp"
+            android:textStyle="normal" />
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/okButton"
+        style="?android:attr/borderlessButtonStyle"
+        android:layout_width="0dp"
+        android:layout_height="36dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginBottom="16dp"
+        android:foreground="?attr/selectableItemBackgroundBorderless"
+        android:text="@string/systemSearchOnboardingButtonOk"
+        android:textColor="@color/cornflowerBlue"
+        android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/checkmarks" />
+
+    <Button
+        android:id="@+id/toggleButton"
+        style="?android:attr/borderlessButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="36dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="16dp"
+        android:foreground="?attr/selectableItemBackgroundBorderless"
+        android:text="@string/systemSearchOnboardingButtonMore"
+        android:textColor="@color/cornflowerBlue"
+        android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/okButton"
+        app:layout_constraintTop_toBottomOf="@id/checkmarks" />
+
+
+</merge>
\ No newline at end of file

From d3b44b4c0e0808d35e9e6164b7bf51b309afa32b Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Wed, 4 Mar 2020 13:28:40 +0000
Subject: [PATCH 05/20] Make title bar color primary color so it is continuous
 with omnibar

---
 app/src/main/res/values/themes.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 901716551567..df612f15cb2c 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -28,6 +28,7 @@
         <item name="windowNoTitle">true</item>
         <item name="bottomSheetDialogTheme">@style/BottomSheetDialog</item>
         <item name="android:windowActivityTransitions">true</item>
+        <item name="android:statusBarColor">?colorPrimary</item>
     </style>
 
     <style name="AppTheme.BaseDark">

From 66105ce8441b5292c26917673441e7728eeb06c3 Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Wed, 4 Mar 2020 19:54:05 +0000
Subject: [PATCH 06/20] Remove landscape

---
 .../app/systemsearch/SystemSearchActivity.kt  |   1 -
 .../include_system_search_onboarding.xml      |  79 -----------
 .../include_system_search_onboarding.xml      | 111 ++++++++++++++-
 ...clude_system_search_onboarding_content.xml | 127 ------------------
 4 files changed, 107 insertions(+), 211 deletions(-)
 delete mode 100644 app/src/main/res/layout-land/include_system_search_onboarding.xml
 delete mode 100644 app/src/main/res/layout/include_system_search_onboarding_content.xml

diff --git a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
index 935718f8e3af..ddbd4cf7abdf 100644
--- a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
@@ -43,7 +43,6 @@ import com.duckduckgo.app.systemsearch.SystemSearchViewModel.Command.*
 import com.duckduckgo.app.systemsearch.SystemSearchViewModel.SystemSearchResultsViewState
 import kotlinx.android.synthetic.main.activity_system_search.*
 import kotlinx.android.synthetic.main.include_system_search_onboarding.*
-import kotlinx.android.synthetic.main.include_system_search_onboarding_content.*
 import javax.inject.Inject
 
 class SystemSearchActivity : DuckDuckGoActivity() {
diff --git a/app/src/main/res/layout-land/include_system_search_onboarding.xml b/app/src/main/res/layout-land/include_system_search_onboarding.xml
deleted file mode 100644
index 8cec9690251f..000000000000
--- a/app/src/main/res/layout-land/include_system_search_onboarding.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-
-<!--
-  ~ Copyright (c) 2018 DuckDuckGo
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/colorPrimary"
-    android:elevation="2dp"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent">
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/onboardingIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/interstitial_high_five"
-        app:layout_constraintBottom_toBottomOf="@+id/onboardingText"
-        app:layout_constraintEnd_toStartOf="@+id/onboardingText"
-        app:layout_constraintHorizontal_bias="0.75"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/onboardingText" />
-
-    <TextView
-        android:id="@+id/onboardingTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="12dp"
-        android:fontFamily="sans-serif"
-        android:gravity="center"
-        android:text="@string/duckDuckGoPrivacySimplified"
-        android:textColor="?attr/normalTextColor"
-        android:textSize="16sp"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/onboardingText"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="6dp"
-        android:layout_marginBottom="12dp"
-        android:fontFamily="sans-serif"
-        android:gravity="center"
-        android:text="@string/systemSearchOnboardingText"
-        android:textColor="?attr/normalTextColor"
-        android:textSize="16sp"
-        android:textStyle="normal"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/onboardingIcon"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/onboardingTitle"
-        app:layout_constraintWidth_max="300dp" />
-
-    <include layout="@layout/include_system_search_onboarding_content" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_system_search_onboarding.xml b/app/src/main/res/layout/include_system_search_onboarding.xml
index b9884dc2c196..adb8b2508d6b 100644
--- a/app/src/main/res/layout/include_system_search_onboarding.xml
+++ b/app/src/main/res/layout/include_system_search_onboarding.xml
@@ -19,22 +19,27 @@
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/onboarding"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="6dp"
     android:layout_marginBottom="2dp"
     android:background="?attr/colorPrimary"
-    android:elevation="2dp"
+    android:clipToPadding="false"
+    android:elevation="4dp"
     android:paddingStart="16dp"
     android:paddingEnd="16dp"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent">
+    app:layout_constraintTop_toTopOf="parent"
+    tools:context="com.duckduckgo.app.systemsearch.SystemSearchActivity"
+    tools:showIn="@layout/include_system_search_onboarding">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/onboardingIcon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
         android:src="@drawable/interstitial_high_five"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -78,6 +83,104 @@
         app:layout_constraintTop_toBottomOf="@id/onboardingTitle"
         app:layout_constraintWidth_max="300dp" />
 
-    <include layout="@layout/include_system_search_onboarding_content"/>
+    <LinearLayout
+        android:id="@+id/checkmarks"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginBottom="12dp"
+        android:orientation="vertical"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="@id/onboardingText"
+        app:layout_constraintStart_toStartOf="@id/onboardingText"
+        app:layout_constraintTop_toBottomOf="@id/onboardingText"
+        tools:visibility="visible">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="6dp"
+            android:fontFamily="sans-serif"
+            android:text="@string/systemSearchOnboaringFeaturesIntroText"
+            android:textColor="?attr/normalTextColor"
+            android:textSize="14sp"
+            android:textStyle="normal" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="6dp"
+            android:drawableStart="@drawable/ic_success"
+            android:drawablePadding="12dp"
+            android:fontFamily="sans-serif"
+            android:text="@string/systemSearchOnboaringFeatureOneText"
+            android:textColor="?attr/normalTextColor"
+            android:textSize="14sp"
+            android:textStyle="normal" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="6dp"
+            android:drawableStart="@drawable/ic_success"
+            android:drawablePadding="12dp"
+            android:fontFamily="sans-serif"
+            android:text="@string/systemSearchOnboaringFeatureTwoText"
+            android:textColor="?attr/normalTextColor"
+            android:textSize="14sp"
+            android:textStyle="normal" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="6dp"
+            android:drawableStart="@drawable/ic_success"
+            android:drawablePadding="12dp"
+            android:fontFamily="sans-serif"
+            android:text="@string/systemSearchOnboaringFeatureThreeText"
+            android:textColor="?attr/normalTextColor"
+            android:textSize="14sp"
+            android:textStyle="normal" />
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/okButton"
+        style="?android:attr/borderlessButtonStyle"
+        android:layout_width="0dp"
+        android:layout_height="36dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginBottom="16dp"
+        android:foreground="?attr/selectableItemBackgroundBorderless"
+        android:text="@string/systemSearchOnboardingButtonOk"
+        android:textColor="@color/cornflowerBlue"
+        android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/checkmarks" />
+
+    <Button
+        android:id="@+id/toggleButton"
+        style="?android:attr/borderlessButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="36dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="16dp"
+        android:foreground="?attr/selectableItemBackgroundBorderless"
+        android:text="@string/systemSearchOnboardingButtonMore"
+        android:textColor="@color/cornflowerBlue"
+        android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/okButton"
+        app:layout_constraintTop_toBottomOf="@id/checkmarks" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_system_search_onboarding_content.xml b/app/src/main/res/layout/include_system_search_onboarding_content.xml
deleted file mode 100644
index 6492d5d780a0..000000000000
--- a/app/src/main/res/layout/include_system_search_onboarding_content.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-
-<!--
-  ~ Copyright (c) 2018 DuckDuckGo
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.duckduckgo.app.systemsearch.SystemSearchActivity"
-    tools:showIn="@layout/include_system_search_onboarding">
-
-    <LinearLayout
-        android:id="@+id/checkmarks"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="12dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="12dp"
-        android:layout_marginBottom="12dp"
-        android:orientation="vertical"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="@id/onboardingText"
-        app:layout_constraintStart_toStartOf="@id/onboardingText"
-        app:layout_constraintTop_toBottomOf="@id/onboardingText"
-        tools:visibility="visible">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:layout_marginBottom="6dp"
-            android:fontFamily="sans-serif"
-            android:text="@string/systemSearchOnboaringFeaturesIntroText"
-            android:textColor="?attr/normalTextColor"
-            android:textSize="14sp"
-            android:textStyle="normal" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:layout_marginBottom="6dp"
-            android:drawableStart="@drawable/ic_success"
-            android:drawablePadding="12dp"
-            android:fontFamily="sans-serif"
-            android:text="@string/systemSearchOnboaringFeatureOneText"
-            android:textColor="?attr/normalTextColor"
-            android:textSize="14sp"
-            android:textStyle="normal" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:layout_marginBottom="6dp"
-            android:drawableStart="@drawable/ic_success"
-            android:drawablePadding="12dp"
-            android:fontFamily="sans-serif"
-            android:text="@string/systemSearchOnboaringFeatureTwoText"
-            android:textColor="?attr/normalTextColor"
-            android:textSize="14sp"
-            android:textStyle="normal" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:layout_marginBottom="6dp"
-            android:drawableStart="@drawable/ic_success"
-            android:drawablePadding="12dp"
-            android:fontFamily="sans-serif"
-            android:text="@string/systemSearchOnboaringFeatureThreeText"
-            android:textColor="?attr/normalTextColor"
-            android:textSize="14sp"
-            android:textStyle="normal" />
-    </LinearLayout>
-
-    <Button
-        android:id="@+id/okButton"
-        style="?android:attr/borderlessButtonStyle"
-        android:layout_width="0dp"
-        android:layout_height="36dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginEnd="12dp"
-        android:layout_marginBottom="16dp"
-        android:foreground="?attr/selectableItemBackgroundBorderless"
-        android:text="@string/systemSearchOnboardingButtonOk"
-        android:textColor="@color/cornflowerBlue"
-        android:textSize="13sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/checkmarks" />
-
-    <Button
-        android:id="@+id/toggleButton"
-        style="?android:attr/borderlessButtonStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="36dp"
-        android:layout_marginStart="12dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="16dp"
-        android:foreground="?attr/selectableItemBackgroundBorderless"
-        android:text="@string/systemSearchOnboardingButtonMore"
-        android:textColor="@color/cornflowerBlue"
-        android:textSize="13sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/okButton"
-        app:layout_constraintTop_toBottomOf="@id/checkmarks" />
-
-
-</merge>
\ No newline at end of file

From 4be1e9416f6b240e33b30c34ee1da2bc698ae258 Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Wed, 4 Mar 2020 19:55:38 +0000
Subject: [PATCH 07/20] Reduce hint text size

---
 app/src/main/res/layout/activity_system_search.xml | 2 +-
 app/src/main/res/values-bg/strings.xml             | 1 +
 app/src/main/res/values-cs/strings.xml             | 1 +
 app/src/main/res/values-da/strings.xml             | 1 +
 app/src/main/res/values-de/strings.xml             | 1 +
 app/src/main/res/values-el/strings.xml             | 1 +
 app/src/main/res/values-es/strings.xml             | 1 +
 app/src/main/res/values-fi/strings.xml             | 1 +
 app/src/main/res/values-fr/strings.xml             | 1 +
 app/src/main/res/values-hr/strings.xml             | 1 +
 app/src/main/res/values-hu/strings.xml             | 1 +
 app/src/main/res/values-it/strings.xml             | 1 +
 app/src/main/res/values-lt/strings.xml             | 1 +
 app/src/main/res/values-nb/strings.xml             | 1 +
 app/src/main/res/values-nl/strings.xml             | 1 +
 app/src/main/res/values-pl/strings.xml             | 1 +
 app/src/main/res/values-pt/strings.xml             | 1 +
 app/src/main/res/values-ro/strings.xml             | 1 +
 app/src/main/res/values-ru/strings.xml             | 1 +
 app/src/main/res/values-sk/strings.xml             | 1 +
 app/src/main/res/values-sl/strings.xml             | 1 +
 app/src/main/res/values-sv/strings.xml             | 1 +
 app/src/main/res/values/strings.xml                | 3 +++
 23 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_system_search.xml b/app/src/main/res/layout/activity_system_search.xml
index 4ec41df79b54..ea6e4d7b9c93 100644
--- a/app/src/main/res/layout/activity_system_search.xml
+++ b/app/src/main/res/layout/activity_system_search.xml
@@ -67,7 +67,7 @@
                     android:layout_marginEnd="16dp"
                     android:background="@android:color/transparent"
                     android:fontFamily="sans-serif-medium"
-                    android:hint="@string/omnibarInputHint"
+                    android:hint="@string/systemSearchOmnibarInputHint"
                     android:imeOptions="flagNoExtractUi|actionGo|flagNoPersonalizedLearning"
                     android:inputType="textUri|textNoSuggestions"
                     android:maxLines="1"
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 0c403a014bb3..730e50afe5c3 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -356,5 +356,6 @@
     <string name="feedbackInitialDisambiguationHappyButtonContentDescription">Бутон за положителни отзиви</string>
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Бутон за отрицателни отзиви</string>
     <string name="feedbackIsImportantToUs">Вашите анонимни отзиви са важни за нас.</string>
+    <string name="systemSearchOmnibarInputHint"><font size="13">Търсене или въвеждане на URL адрес</font></string>
 
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 3de66e98dc7b..1dd52c077db2 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -360,5 +360,6 @@
     <string name="feedbackInitialDisambiguationHappyButtonContentDescription">Tlačítko pozitivní zpětné vazby</string>
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Tlačítko negativní zpětné vazby</string>
     <string name="feedbackIsImportantToUs">Vaše anonymní zpětná vazba je pro nás důležitá.</string>
+    <string name="systemSearchOmnibarInputHint"><font size="13">Vyhledat nebo zadat URL</font></string>
 
 </resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 342dc696dc8e..c7852275a206 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -356,5 +356,6 @@
     <string name="feedbackInitialDisambiguationHappyButtonContentDescription">Knap til positiv feedback</string>
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Knap til negativ feedback</string>
     <string name="feedbackIsImportantToUs">Din anonyme feedback er vigtig for os.</string>
+    <string name="systemSearchOmnibarInputHint"><font size="13">Søg eller indtast URL</font></string>
 
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ade28f0d0a9b..6a3c3fd586e5 100755
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -356,5 +356,6 @@
     <string name="feedbackInitialDisambiguationHappyButtonContentDescription">Schaltfläche für positives Feedback</string>
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Schaltfläche für negatives Feedback</string>
     <string name="feedbackIsImportantToUs">Dein anonymes Feedback ist uns wichtig.</string>
+    <string name="systemSearchOmnibarInputHint"><font size="13">URL eingeben oder suchen</font></string>
 
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 339537bc20b3..309003eeccb6 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -356,5 +356,6 @@
     <string name="feedbackInitialDisambiguationHappyButtonContentDescription">Κουμπί θετικών σχολίων</string>
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Κουμπί αρνητικών σχολίων</string>
     <string name="feedbackIsImportantToUs">Τα ανώνυμα σχόλιά σας είναι σημαντικά για εμάς.</string>
+    <string name="systemSearchOmnibarInputHint"><font size="13">Αναζήτηση ή πληκτρολόγηση διεύθυνσης URL</font></string>
 
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index c6afb0226d70..ab9b21bc4ce2 100755
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -356,5 +356,6 @@
     <string name="feedbackInitialDisambiguationHappyButtonContentDescription">Botón de opinión positiva</string>
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Botón de opinión negativa</string>
     <string name="feedbackIsImportantToUs">Tu opinión anónima nos importa.</string>
+    <string name="systemSearchOmnibarInputHint"><font size="13">Buscar o escribir la URL</font></string>
 
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index bfad98f739d7..84fbe67bb26d 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -356,5 +356,6 @@
     <string name="feedbackInitialDisambiguationHappyButtonContentDescription">Positiivinen palaute -painike</string>
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Negatiivinen palaute -painike</string>
     <string name="feedbackIsImportantToUs">Anonyymi palautteesi on meille tärkeää.</string>
+    <string name="systemSearchOmnibarInputHint"><font size="13">Hae tai kirjoita URL</font></string>
 
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 28f11b9cc21f..0918a4a39704 100755
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -356,5 +356,6 @@
     <string name="feedbackInitialDisambiguationHappyButtonContentDescription">Bouton de commentaires positifs</string>
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Bouton de commentaires négatifs</string>
     <string name="feedbackIsImportantToUs">Vos commentaires anonymes sont importants pour nous.</string>
+    <string name="systemSearchOmnibarInputHint"><font size="13">Faire des recherches ou saisir l\'URL</font></string>
 
 </resources>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index cd6874dcdfff..8b1f4b7f4e68 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -356,5 +356,6 @@
     <string name="feedbackInitialDisambiguationHappyButtonContentDescription">Gumb za pozitivne povratne informacije</string>
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Gumb za negativne povratne informacije</string>
     <string name="feedbackIsImportantToUs">Vaše anonimne povratne informacije su važne za nas.</string>
+    <string name="systemSearchOmnibarInputHint"><font size="13">Traži ili upiši URL adresu</font></string>
 
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 8126bb03baef..6ca35498a809 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -356,5 +356,6 @@
     <string name="feedbackInitialDisambiguationHappyButtonContentDescription">Pozitív visszajelzés gomb</string>
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Negatív visszajelzés gomb</string>
     <string name="feedbackIsImportantToUs">Anonim visszajelzésed fontos számunkra.</string>
+    <string name="systemSearchOmnibarInputHint"><font size="13">Keresés vagy URL beírása</font></string>
 
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index c62cd3fceb6e..0d3acf16282f 100755
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -372,5 +372,6 @@
     <string name="feedbackInitialDisambiguationHappyButtonContentDescription">Pulsante feedback positivo</string>
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Pulsante feedback negativo</string>
     <string name="feedbackIsImportantToUs">Il tuo feedback anonimo è importante per noi.</string>
+    <string name="systemSearchOmnibarInputHint"><font size="13">Cerca o inserisci URL</font></string>
 
 </resources>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 6124513c4f76..cb0ceb9c9cfe 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -360,5 +360,6 @@
     <string name="feedbackInitialDisambiguationHappyButtonContentDescription">Teigiamų atsiliepimų mygtukas</string>
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Neigiamų atsiliepimų mygtukas</string>
     <string name="feedbackIsImportantToUs">Jūsų anoniminiai atsiliepimai mums labai svarbūs.</string>
+    <string name="systemSearchOmnibarInputHint"><font size="13">Ieškoti arba įvesti URL</font></string>
 
 </resources>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 7a7aea019af8..da2a57eb9c61 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -356,5 +356,6 @@
     <string name="feedbackInitialDisambiguationHappyButtonContentDescription">Knapp for positiv tilbakemelding</string>
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Knapp for negativ tilbakemelding</string>
     <string name="feedbackIsImportantToUs">Den anonyme tilbakemeldingen din er viktig for oss.</string>
+    <string name="systemSearchOmnibarInputHint"><font size="13">Søk eller skriv URL</font></string>
 
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 3fd2eaf04d4a..7fdb2afc21d8 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -356,5 +356,6 @@
     <string name="feedbackInitialDisambiguationHappyButtonContentDescription">Knop positieve feedback</string>
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Knop negatieve feedback</string>
     <string name="feedbackIsImportantToUs">Jouw anonieme feedback is belangrijk voor ons.</string>
+    <string name="systemSearchOmnibarInputHint"><font size="13">URL zoeken of typen</font></string>
 
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 0b731b45a380..bd119ef8c12c 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -364,5 +364,6 @@
     <string name="feedbackInitialDisambiguationHappyButtonContentDescription">Przycisk pozytywnej opinii</string>
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Przycisk negatywnej opinii</string>
     <string name="feedbackIsImportantToUs">Twoja anonimowa opinia ma dla nas ogromne znaczenie.</string>
+    <string name="systemSearchOmnibarInputHint"><font size="13">Wyszukaj lub wpisz adres URL</font></string>
 
 </resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 46ed2ce5b1f3..a835b45fe9bd 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -356,5 +356,6 @@
     <string name="feedbackInitialDisambiguationHappyButtonContentDescription">Botão de comentário positivo</string>
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Botão de comentário negativo</string>
     <string name="feedbackIsImportantToUs">Os seus comentários anónimos são importantes para nós.</string>
+    <string name="systemSearchOmnibarInputHint"><font size="13">Pesquisar ou escrever URL</font></string>
 
 </resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index ba9e65f67a22..273a77b6edc8 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -360,5 +360,6 @@
     <string name="feedbackInitialDisambiguationHappyButtonContentDescription">Buton feedback pozitiv</string>
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Buton feedback negativ</string>
     <string name="feedbackIsImportantToUs">Feedbackul dvs. anonim este important pentru noi.</string>
+    <string name="systemSearchOmnibarInputHint"><font size="13">Căutare sau tastare URL</font></string>
 
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 1a917ed0a2ea..2c00a1a1d4f2 100755
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -379,5 +379,6 @@
     <string name="feedbackInitialDisambiguationHappyButtonContentDescription">Кнопка отправки положительного отзыва</string>
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Кнопка отправки отрицательного отзыва</string>
     <string name="feedbackIsImportantToUs">Ваш отзыв важен для нас. Отзыв анонимный.</string>
+    <string name="systemSearchOmnibarInputHint"><font size="13">Выполнить поиск или ввести URL-адрес</font></string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 266575c89991..f6369737b8db 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -357,5 +357,6 @@
     <string name="feedbackInitialDisambiguationHappyButtonContentDescription">Tlačidlo pozitívnej spätnej väzby</string>
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Tlačidlo negatívnej spätnej väzby</string>
     <string name="feedbackIsImportantToUs">Anonymná spätná väzba je pre nás dôležitá.</string>
+    <string name="systemSearchOmnibarInputHint"><font size="13">Vyhľadať alebo zadať webovú adresu</font></string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 8dc124338c54..df02a87f4142 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -364,5 +364,6 @@
     <string name="feedbackInitialDisambiguationHappyButtonContentDescription">Gumb Pozitivne povratne informacije</string>
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Gumb Negativne povratne informacije</string>
     <string name="feedbackIsImportantToUs">Vaše anonimne povratne informacije so nam pomembne.</string>
+    <string name="systemSearchOmnibarInputHint"><font size="13">Iščite z iskalnikom ali vnesite URL</font></string>
 
 </resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 6728119ee312..6111303da3b3 100755
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -372,5 +372,6 @@
     <string name="feedbackInitialDisambiguationHappyButtonContentDescription">Knappen för positiv återkoppling</string>
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Knappen för negativ återkoppling</string>
     <string name="feedbackIsImportantToUs">Din anonyma återkoppling är viktig för oss.</string>
+    <string name="systemSearchOmnibarInputHint"><font size="13">Sök eller skriv in URL</font></string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 01a3bcb59201..15cbfc9ecf82 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -366,4 +366,7 @@
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Negative feedback button</string>
     <string name="feedbackIsImportantToUs">Your anonymous feedback is important to us.</string>
 
+    <!-- System Search -->
+    <string name="systemSearchOmnibarInputHint"><font size="13">Search or type URL</font></string>
+
 </resources>

From f657d5634b01ae552f34ea19b6bcfd4581319294 Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Wed, 4 Mar 2020 19:56:11 +0000
Subject: [PATCH 08/20] Remove custom tap feedback

---
 app/src/main/res/layout/include_system_search_onboarding.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/res/layout/include_system_search_onboarding.xml b/app/src/main/res/layout/include_system_search_onboarding.xml
index adb8b2508d6b..9ecdb56593a1 100644
--- a/app/src/main/res/layout/include_system_search_onboarding.xml
+++ b/app/src/main/res/layout/include_system_search_onboarding.xml
@@ -158,7 +158,6 @@
         android:layout_marginTop="12dp"
         android:layout_marginEnd="12dp"
         android:layout_marginBottom="16dp"
-        android:foreground="?attr/selectableItemBackgroundBorderless"
         android:text="@string/systemSearchOnboardingButtonOk"
         android:textColor="@color/cornflowerBlue"
         android:textSize="13sp"
@@ -175,7 +174,6 @@
         android:layout_marginTop="12dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="16dp"
-        android:foreground="?attr/selectableItemBackgroundBorderless"
         android:text="@string/systemSearchOnboardingButtonMore"
         android:textColor="@color/cornflowerBlue"
         android:textSize="13sp"

From cecd15521e3393254a978407852c64da51dff832 Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Wed, 4 Mar 2020 19:56:53 +0000
Subject: [PATCH 09/20] Remove duplicate id

---
 app/src/main/res/layout/include_system_search_onboarding.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/layout/include_system_search_onboarding.xml b/app/src/main/res/layout/include_system_search_onboarding.xml
index 9ecdb56593a1..2e686fc2c7ce 100644
--- a/app/src/main/res/layout/include_system_search_onboarding.xml
+++ b/app/src/main/res/layout/include_system_search_onboarding.xml
@@ -20,7 +20,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/onboarding"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="2dp"

From a438e6dbc4ae8892a6e1e78470a9de75d073acc4 Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Thu, 5 Mar 2020 14:03:42 +0000
Subject: [PATCH 10/20] Add separation line

---
 .../res/layout/activity_system_search.xml     |   1 -
 .../include_system_search_onboarding.xml      | 290 +++++++++---------
 2 files changed, 148 insertions(+), 143 deletions(-)

diff --git a/app/src/main/res/layout/activity_system_search.xml b/app/src/main/res/layout/activity_system_search.xml
index ea6e4d7b9c93..3d73a19ffd9d 100644
--- a/app/src/main/res/layout/activity_system_search.xml
+++ b/app/src/main/res/layout/activity_system_search.xml
@@ -123,7 +123,6 @@
             android:elevation="4dp">
 
             <include
-                android:id="@+id/onboarding"
                 layout="@layout/include_system_search_onboarding"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/include_system_search_onboarding.xml b/app/src/main/res/layout/include_system_search_onboarding.xml
index 2e686fc2c7ce..30353b31535b 100644
--- a/app/src/main/res/layout/include_system_search_onboarding.xml
+++ b/app/src/main/res/layout/include_system_search_onboarding.xml
@@ -17,167 +17,173 @@
   ~ limitations under the License.
   -->
 
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="2dp"
-    android:background="?attr/colorPrimary"
-    android:clipToPadding="false"
-    android:elevation="4dp"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent"
-    tools:context="com.duckduckgo.app.systemsearch.SystemSearchActivity"
-    tools:showIn="@layout/include_system_search_onboarding">
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/onboardingIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:src="@drawable/interstitial_high_five"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <TextView
-        android:id="@+id/onboardingTitle"
-        android:layout_width="0dp"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/onboarding"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="42dp"
         android:layout_marginTop="2dp"
-        android:layout_marginEnd="42dp"
-        android:layout_marginBottom="12dp"
-        android:fontFamily="sans-serif"
-        android:gravity="center"
-        android:text="@string/duckDuckGoPrivacySimplified"
-        android:textColor="?attr/normalTextColor"
-        android:textSize="16sp"
-        android:textStyle="bold"
+        android:layout_marginBottom="2dp"
+        android:background="?attr/colorPrimary"
+        android:clipToPadding="false"
+        android:elevation="4dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/onboardingIcon"
-        app:layout_constraintWidth_max="300dp" />
-
-    <TextView
-        android:id="@+id/onboardingText"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="42dp"
-        android:layout_marginTop="6dp"
-        android:layout_marginEnd="42dp"
-        android:layout_marginBottom="12dp"
-        android:fontFamily="sans-serif"
-        android:gravity="center"
-        android:text="@string/systemSearchOnboardingText"
-        android:textColor="?attr/normalTextColor"
-        android:textSize="16sp"
-        android:textStyle="normal"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/onboardingTitle"
-        app:layout_constraintWidth_max="300dp" />
-
-    <LinearLayout
-        android:id="@+id/checkmarks"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="12dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="12dp"
-        android:layout_marginBottom="12dp"
-        android:orientation="vertical"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="@id/onboardingText"
-        app:layout_constraintStart_toStartOf="@id/onboardingText"
-        app:layout_constraintTop_toBottomOf="@id/onboardingText"
-        tools:visibility="visible">
+        app:layout_constraintTop_toTopOf="parent"
+        tools:context="com.duckduckgo.app.systemsearch.SystemSearchActivity"
+        tools:showIn="@layout/include_system_search_onboarding">
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/onboardingIcon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:layout_marginBottom="6dp"
-            android:fontFamily="sans-serif"
-            android:text="@string/systemSearchOnboaringFeaturesIntroText"
-            android:textColor="?attr/normalTextColor"
-            android:textSize="14sp"
-            android:textStyle="normal" />
+            android:layout_marginTop="8dp"
+            android:src="@drawable/interstitial_high_five"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            android:layout_width="wrap_content"
+            android:id="@+id/onboardingTitle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:layout_marginBottom="6dp"
-            android:drawableStart="@drawable/ic_success"
-            android:drawablePadding="12dp"
+            android:layout_marginStart="42dp"
+            android:layout_marginTop="2dp"
+            android:layout_marginEnd="42dp"
+            android:layout_marginBottom="12dp"
             android:fontFamily="sans-serif"
-            android:text="@string/systemSearchOnboaringFeatureOneText"
+            android:gravity="center"
+            android:text="@string/duckDuckGoPrivacySimplified"
             android:textColor="?attr/normalTextColor"
-            android:textSize="14sp"
-            android:textStyle="normal" />
+            android:textSize="16sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/onboardingIcon"
+            app:layout_constraintWidth_max="300dp" />
 
         <TextView
-            android:layout_width="wrap_content"
+            android:id="@+id/onboardingText"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginStart="42dp"
             android:layout_marginTop="6dp"
-            android:layout_marginBottom="6dp"
-            android:drawableStart="@drawable/ic_success"
-            android:drawablePadding="12dp"
+            android:layout_marginEnd="42dp"
+            android:layout_marginBottom="12dp"
             android:fontFamily="sans-serif"
-            android:text="@string/systemSearchOnboaringFeatureTwoText"
+            android:gravity="center"
+            android:text="@string/systemSearchOnboardingText"
             android:textColor="?attr/normalTextColor"
-            android:textSize="14sp"
-            android:textStyle="normal" />
+            android:textSize="16sp"
+            android:textStyle="normal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/onboardingTitle"
+            app:layout_constraintWidth_max="300dp" />
 
-        <TextView
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:id="@+id/checkmarks"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:layout_marginBottom="6dp"
-            android:drawableStart="@drawable/ic_success"
-            android:drawablePadding="12dp"
-            android:fontFamily="sans-serif"
-            android:text="@string/systemSearchOnboaringFeatureThreeText"
-            android:textColor="?attr/normalTextColor"
-            android:textSize="14sp"
-            android:textStyle="normal" />
-    </LinearLayout>
-
-    <Button
-        android:id="@+id/okButton"
-        style="?android:attr/borderlessButtonStyle"
-        android:layout_width="0dp"
-        android:layout_height="36dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginEnd="12dp"
-        android:layout_marginBottom="16dp"
-        android:text="@string/systemSearchOnboardingButtonOk"
-        android:textColor="@color/cornflowerBlue"
-        android:textSize="13sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/checkmarks" />
-
-    <Button
-        android:id="@+id/toggleButton"
-        style="?android:attr/borderlessButtonStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="36dp"
-        android:layout_marginStart="12dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="16dp"
-        android:text="@string/systemSearchOnboardingButtonMore"
-        android:textColor="@color/cornflowerBlue"
-        android:textSize="13sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/okButton"
-        app:layout_constraintTop_toBottomOf="@id/checkmarks" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+            android:layout_marginStart="12dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="12dp"
+            android:layout_marginBottom="12dp"
+            android:orientation="vertical"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="@id/onboardingText"
+            app:layout_constraintStart_toStartOf="@id/onboardingText"
+            app:layout_constraintTop_toBottomOf="@id/onboardingText"
+            tools:visibility="visible">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:layout_marginBottom="6dp"
+                android:fontFamily="sans-serif"
+                android:text="@string/systemSearchOnboaringFeaturesIntroText"
+                android:textColor="?attr/normalTextColor"
+                android:textSize="14sp"
+                android:textStyle="normal" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                android:layout_marginBottom="6dp"
+                android:drawableStart="@drawable/ic_success"
+                android:drawablePadding="12dp"
+                android:fontFamily="sans-serif"
+                android:text="@string/systemSearchOnboaringFeatureOneText"
+                android:textColor="?attr/normalTextColor"
+                android:textSize="14sp"
+                android:textStyle="normal" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                android:layout_marginBottom="6dp"
+                android:drawableStart="@drawable/ic_success"
+                android:drawablePadding="12dp"
+                android:fontFamily="sans-serif"
+                android:text="@string/systemSearchOnboaringFeatureTwoText"
+                android:textColor="?attr/normalTextColor"
+                android:textSize="14sp"
+                android:textStyle="normal" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                android:layout_marginBottom="6dp"
+                android:drawableStart="@drawable/ic_success"
+                android:drawablePadding="12dp"
+                android:fontFamily="sans-serif"
+                android:text="@string/systemSearchOnboaringFeatureThreeText"
+                android:textColor="?attr/normalTextColor"
+                android:textSize="14sp"
+                android:textStyle="normal" />
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/okButton"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_width="0dp"
+            android:layout_height="36dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="12dp"
+            android:layout_marginBottom="16dp"
+            android:text="@string/systemSearchOnboardingButtonOk"
+            android:textColor="@color/cornflowerBlue"
+            android:textSize="13sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/checkmarks" />
+
+        <Button
+            android:id="@+id/toggleButton"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            android:layout_marginStart="12dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="16dp"
+            android:text="@string/systemSearchOnboardingButtonMore"
+            android:textColor="@color/cornflowerBlue"
+            android:textSize="13sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/okButton"
+            app:layout_constraintTop_toBottomOf="@id/checkmarks" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</merge>
\ No newline at end of file

From 086ac47f58682b5c763d9b964c59b6d55d912cd6 Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Thu, 5 Mar 2020 15:49:07 +0000
Subject: [PATCH 11/20] Improve scroll logic to account for greater range of
 views

---
 .../com/duckduckgo/app/systemsearch/SystemSearchActivity.kt    | 3 +--
 app/src/main/res/layout/activity_system_search.xml             | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
index ddbd4cf7abdf..98743f62593e 100644
--- a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
@@ -141,7 +141,7 @@ class SystemSearchActivity : DuckDuckGoActivity() {
 
     private fun configureOmnibar() {
         results.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
-            val scrollable = results.maxScrollAmount > MINIMUM_SCROLL_HEIGHT
+            val scrollable = resultsContent.height > results.height
             if (scrollable) {
                 omnibarScrolling.enableOmnibarScrolling(toolbar)
             } else {
@@ -247,7 +247,6 @@ class SystemSearchActivity : DuckDuckGoActivity() {
 
         const val WIDGET_SEARCH_EXTRA = "WIDGET_SEARCH_EXTRA"
         const val NEW_SEARCH_ACTION = "com.duckduckgo.mobile.android.NEW_SEARCH"
-        const val MINIMUM_SCROLL_HEIGHT = 86 // enough space for blank "no suggestion" and padding
 
         fun intent(context: Context, widgetSearch: Boolean = false): Intent {
             val intent = Intent(context, SystemSearchActivity::class.java)
diff --git a/app/src/main/res/layout/activity_system_search.xml b/app/src/main/res/layout/activity_system_search.xml
index 3d73a19ffd9d..9151d710d1e7 100644
--- a/app/src/main/res/layout/activity_system_search.xml
+++ b/app/src/main/res/layout/activity_system_search.xml
@@ -116,6 +116,7 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/resultsContent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/colorPrimary"

From 55aadc04053e7c5eb110e6b38acb457d4ba0b53b Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Thu, 5 Mar 2020 18:00:34 +0000
Subject: [PATCH 12/20] Persist onboarding option

---
 .../java/com/duckduckgo/app/global/ViewModelFactory.kt    | 2 +-
 .../duckduckgo/app/systemsearch/SystemSearchActivity.kt   | 1 +
 .../duckduckgo/app/systemsearch/SystemSearchViewModel.kt  | 8 ++++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt b/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
index 807fd01dda13..6105cd9041fd 100644
--- a/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
@@ -113,7 +113,7 @@ class ViewModelFactory @Inject constructor(
         with(modelClass) {
             when {
                 isAssignableFrom(LaunchViewModel::class.java) -> LaunchViewModel(onboardingStore, appInstallationReferrerStateListener)
-                isAssignableFrom(SystemSearchViewModel::class.java) -> SystemSearchViewModel(autoCompleteApi, deviceAppLookup)
+                isAssignableFrom(SystemSearchViewModel::class.java) -> SystemSearchViewModel(onboardingStore, autoCompleteApi, deviceAppLookup)
                 isAssignableFrom(OnboardingViewModel::class.java) -> onboardingViewModel()
                 isAssignableFrom(BrowserViewModel::class.java) -> browserViewModel()
                 isAssignableFrom(BrowserTabViewModel::class.java) -> browserTabViewModel()
diff --git a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
index 98743f62593e..3f173f7cd7db 100644
--- a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
@@ -37,6 +37,7 @@ import com.duckduckgo.app.browser.omnibar.OmnibarScrolling
 import com.duckduckgo.app.global.DuckDuckGoActivity
 import com.duckduckgo.app.global.view.TextChangedWatcher
 import com.duckduckgo.app.global.view.hideKeyboard
+import com.duckduckgo.app.onboarding.store.OnboardingStore
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.app.statistics.pixels.Pixel.PixelName
 import com.duckduckgo.app.systemsearch.SystemSearchViewModel.Command.*
diff --git a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt
index 635f40200130..586d2524c5d2 100644
--- a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt
@@ -24,6 +24,7 @@ import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteResult
 import com.duckduckgo.app.global.DefaultDispatcherProvider
 import com.duckduckgo.app.global.DispatcherProvider
 import com.duckduckgo.app.global.SingleLiveEvent
+import com.duckduckgo.app.onboarding.store.OnboardingStore
 import com.jakewharton.rxrelay2.PublishRelay
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
@@ -32,15 +33,17 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import java.util.concurrent.TimeUnit
+import javax.inject.Inject
 
 class SystemSearchViewModel(
+    private var onboardingStore: OnboardingStore,
     private val autoComplete: AutoComplete,
     private val deviceAppLookup: DeviceAppLookup,
     private val dispatchers: DispatcherProvider = DefaultDispatcherProvider()
 ) : ViewModel() {
 
     data class OnboardingViewState(
-        val visibile: Boolean = true,
+        val visibile: Boolean,
         val expanded: Boolean = false
     )
 
@@ -83,7 +86,7 @@ class SystemSearchViewModel(
     }
 
     private fun resetOnboardingState() {
-        onboardingViewState.value = OnboardingViewState()
+        onboardingViewState.value = OnboardingViewState(visibile = onboardingStore.shouldShow)
     }
 
     private fun resetResultsState() {
@@ -113,6 +116,7 @@ class SystemSearchViewModel(
 
     fun userDismissedOnboarding() {
         onboardingViewState.value = currentOnboardingState().copy(visibile = false)
+        onboardingStore.onboardingShown()
     }
 
     fun userUpdatedQuery(query: String) {

From 77655b5cf8d749fe9d66ec2ed56f9c2704df0104 Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Fri, 6 Mar 2020 11:14:22 +0000
Subject: [PATCH 13/20] Add test dependency

---
 .../duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt
index f6a3149dac75..b901880ab43c 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt
@@ -24,6 +24,7 @@ import com.duckduckgo.app.InstantSchedulersRule
 import com.duckduckgo.app.autocomplete.api.AutoComplete
 import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteResult
 import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteSuggestion.AutoCompleteSearchSuggestion
+import com.duckduckgo.app.onboarding.store.OnboardingStore
 import com.duckduckgo.app.systemsearch.SystemSearchViewModel.Command
 import com.duckduckgo.app.systemsearch.SystemSearchViewModel.Command.LaunchDuckDuckGo
 import com.nhaarman.mockitokotlin2.argumentCaptor
@@ -51,6 +52,7 @@ class SystemSearchViewModelTest {
     @get:Rule
     var coroutineRule = CoroutineTestRule()
 
+    private val mockOnboardingStore: OnboardingStore = mock()
     private val mockDeviceAppLookup: DeviceAppLookup = mock()
     private val mockAutoComplete: AutoComplete = mock()
 
@@ -65,7 +67,7 @@ class SystemSearchViewModelTest {
         whenever(mockAutoComplete.autoComplete(BLANK_QUERY)).thenReturn(Observable.just(autocompleteBlankResult))
         whenever(mockDeviceAppLookup.query(QUERY)).thenReturn(appQueryResult)
         whenever(mockDeviceAppLookup.query(BLANK_QUERY)).thenReturn(appBlankResult)
-        testee = SystemSearchViewModel(mockAutoComplete, mockDeviceAppLookup, coroutineRule.testDispatcherProvider)
+        testee = SystemSearchViewModel(mockOnboardingStore, mockAutoComplete, mockDeviceAppLookup, coroutineRule.testDispatcherProvider)
         testee.command.observeForever(commandObserver)
     }
 

From 2371597c8c152ab53e8de2e9590341d49a6bb134 Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Fri, 6 Mar 2020 17:28:22 +0000
Subject: [PATCH 14/20] Add onboarding to bottom and update asset name

---
 .../app/global/view/ViewExtension.kt          |   3 +-
 .../app/systemsearch/SystemSearchActivity.kt  |  34 +-
 ...=> system_search_onboarding_high_five.xml} |   0
 .../res/layout/activity_system_search.xml     |  13 +-
 .../include_system_search_onboarding.xml      | 292 +++++++++---------
 app/src/main/res/values/dimens.xml            |   2 +
 6 files changed, 175 insertions(+), 169 deletions(-)
 rename app/src/main/res/drawable/{interstitial_high_five.xml => system_search_onboarding_high_five.xml} (100%)

diff --git a/app/src/main/java/com/duckduckgo/app/global/view/ViewExtension.kt b/app/src/main/java/com/duckduckgo/app/global/view/ViewExtension.kt
index afd0188ca162..c7883b5eff94 100644
--- a/app/src/main/java/com/duckduckgo/app/global/view/ViewExtension.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/view/ViewExtension.kt
@@ -80,4 +80,5 @@ fun View.hideKeyboard(): Boolean {
 }
 
 fun Int.toDp(): Int = (this / Resources.getSystem().displayMetrics.density).toInt()
-fun Int.toPx(): Int = (this * Resources.getSystem().displayMetrics.density).toInt()
\ No newline at end of file
+fun Int.toPx(): Int = (this * Resources.getSystem().displayMetrics.density).toInt()
+fun Float.toPx(): Float = this * Resources.getSystem().displayMetrics.density
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
index 3f173f7cd7db..d2fbaf9432f2 100644
--- a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
@@ -37,7 +37,6 @@ import com.duckduckgo.app.browser.omnibar.OmnibarScrolling
 import com.duckduckgo.app.global.DuckDuckGoActivity
 import com.duckduckgo.app.global.view.TextChangedWatcher
 import com.duckduckgo.app.global.view.hideKeyboard
-import com.duckduckgo.app.onboarding.store.OnboardingStore
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.app.statistics.pixels.Pixel.PixelName
 import com.duckduckgo.app.systemsearch.SystemSearchViewModel.Command.*
@@ -141,14 +140,16 @@ class SystemSearchActivity : DuckDuckGoActivity() {
     }
 
     private fun configureOmnibar() {
-        results.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
-            val scrollable = resultsContent.height > results.height
-            if (scrollable) {
-                omnibarScrolling.enableOmnibarScrolling(toolbar)
-            } else {
-                showOmnibar()
-                omnibarScrolling.disableOmnibarScrolling(toolbar)
-            }
+        resultsContent.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ -> updateScroll() }
+    }
+
+    private fun updateScroll() {
+        val scrollable = resultsContent.height > (results.height - results.paddingTop - results.paddingBottom)
+        if (scrollable) {
+            omnibarScrolling.enableOmnibarScrolling(toolbar)
+        } else {
+            showOmnibar()
+            omnibarScrolling.disableOmnibarScrolling(toolbar)
         }
     }
 
@@ -167,10 +168,19 @@ class SystemSearchActivity : DuckDuckGoActivity() {
     }
 
     private fun renderOnboardingViewState(viewState: SystemSearchViewModel.OnboardingViewState) {
-        onboarding.visibility = if (viewState.visibile) View.VISIBLE else View.GONE
-        checkmarks.visibility = if (viewState.expanded) View.VISIBLE else View.GONE
+        if (viewState.visibile) {
+            onboarding.visibility = View.VISIBLE
+            results.elevation = 0.0f
+            checkmarks.visibility = if (viewState.expanded) View.VISIBLE else View.GONE
+            refreshOnboardingToggleText(viewState.expanded)
+        } else {
+            onboarding.visibility = View.GONE
+            results.elevation = if (viewState.visibile) 0.0f else resources.getDimension(R.dimen.systemSearchResultsElevation)
+        }
+    }
 
-        val toggleText = if (viewState.expanded) R.string.systemSearchOnboardingButtonLess else R.string.systemSearchOnboardingButtonMore
+    private fun refreshOnboardingToggleText(expanded: Boolean) {
+        val toggleText = if (expanded) R.string.systemSearchOnboardingButtonLess else R.string.systemSearchOnboardingButtonMore
         toggleButton.text = getString(toggleText)
     }
 
diff --git a/app/src/main/res/drawable/interstitial_high_five.xml b/app/src/main/res/drawable/system_search_onboarding_high_five.xml
similarity index 100%
rename from app/src/main/res/drawable/interstitial_high_five.xml
rename to app/src/main/res/drawable/system_search_onboarding_high_five.xml
diff --git a/app/src/main/res/layout/activity_system_search.xml b/app/src/main/res/layout/activity_system_search.xml
index 9151d710d1e7..43c06a1e8cdb 100644
--- a/app/src/main/res/layout/activity_system_search.xml
+++ b/app/src/main/res/layout/activity_system_search.xml
@@ -111,7 +111,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:clipToPadding="false"
-        android:elevation="4dp"
+        android:elevation="@dimen/systemSearchResultsElevation"
         android:paddingBottom="4dp"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
@@ -120,21 +120,16 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/colorPrimary"
-            android:backgroundTint="?attr/colorPrimary"
+            android:clipToPadding="false"
             android:elevation="4dp">
 
-            <include
-                layout="@layout/include_system_search_onboarding"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/autocompleteSuggestions"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/onboarding"
+                app:layout_constraintTop_toTopOf="parent"
                 tools:itemCount="4"
                 tools:listitem="@layout/item_autocomplete_search_suggestion" />
 
@@ -164,6 +159,8 @@
                 tools:itemCount="4"
                 tools:listitem="@layout/item_device_app_suggestion" />
 
+            <include layout="@layout/include_system_search_onboarding" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/include_system_search_onboarding.xml b/app/src/main/res/layout/include_system_search_onboarding.xml
index 30353b31535b..f84393770953 100644
--- a/app/src/main/res/layout/include_system_search_onboarding.xml
+++ b/app/src/main/res/layout/include_system_search_onboarding.xml
@@ -17,173 +17,169 @@
   ~ limitations under the License.
   -->
 
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/onboarding"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/colorPrimary"
+    android:clipToPadding="false"
+    android:elevation="4dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
+    android:visibility="gone"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toBottomOf="@id/deviceAppSuggestions"
+    tools:context="com.duckduckgo.app.systemsearch.SystemSearchActivity"
+    tools:showIn="@layout/include_system_search_onboarding"
+    tools:visibility="visible">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/onboardingIcon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:src="@drawable/system_search_onboarding_high_five"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/onboarding"
-        android:layout_width="match_parent"
+    <TextView
+        android:id="@+id/onboardingTitle"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="42dp"
         android:layout_marginTop="2dp"
-        android:layout_marginBottom="2dp"
-        android:background="?attr/colorPrimary"
-        android:clipToPadding="false"
-        android:elevation="4dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
+        android:layout_marginEnd="42dp"
+        android:layout_marginBottom="12dp"
+        android:fontFamily="sans-serif"
+        android:gravity="center"
+        android:text="@string/duckDuckGoPrivacySimplified"
+        android:textColor="?attr/normalTextColor"
+        android:textSize="16sp"
+        android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:context="com.duckduckgo.app.systemsearch.SystemSearchActivity"
-        tools:showIn="@layout/include_system_search_onboarding">
+        app:layout_constraintTop_toBottomOf="@id/onboardingIcon"
+        app:layout_constraintWidth_max="300dp" />
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/onboardingIcon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:src="@drawable/interstitial_high_five"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+    <TextView
+        android:id="@+id/onboardingText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="42dp"
+        android:layout_marginTop="6dp"
+        android:layout_marginEnd="42dp"
+        android:layout_marginBottom="12dp"
+        android:fontFamily="sans-serif"
+        android:gravity="center"
+        android:text="@string/systemSearchOnboardingText"
+        android:textColor="?attr/normalTextColor"
+        android:textSize="16sp"
+        android:textStyle="normal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/onboardingTitle"
+        app:layout_constraintWidth_max="300dp" />
+
+    <LinearLayout
+        android:id="@+id/checkmarks"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginBottom="12dp"
+        android:orientation="vertical"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="@id/onboardingText"
+        app:layout_constraintStart_toStartOf="@id/onboardingText"
+        app:layout_constraintTop_toBottomOf="@id/onboardingText"
+        tools:visibility="visible">
 
         <TextView
-            android:id="@+id/onboardingTitle"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="42dp"
-            android:layout_marginTop="2dp"
-            android:layout_marginEnd="42dp"
-            android:layout_marginBottom="12dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="6dp"
             android:fontFamily="sans-serif"
-            android:gravity="center"
-            android:text="@string/duckDuckGoPrivacySimplified"
+            android:text="@string/systemSearchOnboaringFeaturesIntroText"
             android:textColor="?attr/normalTextColor"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/onboardingIcon"
-            app:layout_constraintWidth_max="300dp" />
+            android:textSize="14sp"
+            android:textStyle="normal" />
 
         <TextView
-            android:id="@+id/onboardingText"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="42dp"
             android:layout_marginTop="6dp"
-            android:layout_marginEnd="42dp"
-            android:layout_marginBottom="12dp"
+            android:layout_marginBottom="6dp"
+            android:drawableStart="@drawable/ic_success"
+            android:drawablePadding="12dp"
             android:fontFamily="sans-serif"
-            android:gravity="center"
-            android:text="@string/systemSearchOnboardingText"
+            android:text="@string/systemSearchOnboaringFeatureOneText"
             android:textColor="?attr/normalTextColor"
-            android:textSize="16sp"
-            android:textStyle="normal"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/onboardingTitle"
-            app:layout_constraintWidth_max="300dp" />
+            android:textSize="14sp"
+            android:textStyle="normal" />
 
-        <LinearLayout
-            android:id="@+id/checkmarks"
-            android:layout_width="0dp"
+        <TextView
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="12dp"
-            android:layout_marginBottom="12dp"
-            android:orientation="vertical"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="@id/onboardingText"
-            app:layout_constraintStart_toStartOf="@id/onboardingText"
-            app:layout_constraintTop_toBottomOf="@id/onboardingText"
-            tools:visibility="visible">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:layout_marginBottom="6dp"
-                android:fontFamily="sans-serif"
-                android:text="@string/systemSearchOnboaringFeaturesIntroText"
-                android:textColor="?attr/normalTextColor"
-                android:textSize="14sp"
-                android:textStyle="normal" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="6dp"
-                android:layout_marginBottom="6dp"
-                android:drawableStart="@drawable/ic_success"
-                android:drawablePadding="12dp"
-                android:fontFamily="sans-serif"
-                android:text="@string/systemSearchOnboaringFeatureOneText"
-                android:textColor="?attr/normalTextColor"
-                android:textSize="14sp"
-                android:textStyle="normal" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="6dp"
-                android:layout_marginBottom="6dp"
-                android:drawableStart="@drawable/ic_success"
-                android:drawablePadding="12dp"
-                android:fontFamily="sans-serif"
-                android:text="@string/systemSearchOnboaringFeatureTwoText"
-                android:textColor="?attr/normalTextColor"
-                android:textSize="14sp"
-                android:textStyle="normal" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="6dp"
-                android:layout_marginBottom="6dp"
-                android:drawableStart="@drawable/ic_success"
-                android:drawablePadding="12dp"
-                android:fontFamily="sans-serif"
-                android:text="@string/systemSearchOnboaringFeatureThreeText"
-                android:textColor="?attr/normalTextColor"
-                android:textSize="14sp"
-                android:textStyle="normal" />
-        </LinearLayout>
-
-        <Button
-            android:id="@+id/okButton"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="36dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="12dp"
-            android:layout_marginEnd="12dp"
-            android:layout_marginBottom="16dp"
-            android:text="@string/systemSearchOnboardingButtonOk"
-            android:textColor="@color/cornflowerBlue"
-            android:textSize="13sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/checkmarks" />
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="6dp"
+            android:drawableStart="@drawable/ic_success"
+            android:drawablePadding="12dp"
+            android:fontFamily="sans-serif"
+            android:text="@string/systemSearchOnboaringFeatureTwoText"
+            android:textColor="?attr/normalTextColor"
+            android:textSize="14sp"
+            android:textStyle="normal" />
 
-        <Button
-            android:id="@+id/toggleButton"
-            style="?android:attr/borderlessButtonStyle"
+        <TextView
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
-            android:layout_marginStart="12dp"
-            android:layout_marginTop="12dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="16dp"
-            android:text="@string/systemSearchOnboardingButtonMore"
-            android:textColor="@color/cornflowerBlue"
-            android:textSize="13sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/okButton"
-            app:layout_constraintTop_toBottomOf="@id/checkmarks" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</merge>
\ No newline at end of file
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="6dp"
+            android:drawableStart="@drawable/ic_success"
+            android:drawablePadding="12dp"
+            android:fontFamily="sans-serif"
+            android:text="@string/systemSearchOnboaringFeatureThreeText"
+            android:textColor="?attr/normalTextColor"
+            android:textSize="14sp"
+            android:textStyle="normal" />
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/okButton"
+        style="?android:attr/borderlessButtonStyle"
+        android:layout_width="0dp"
+        android:layout_height="36dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginBottom="16dp"
+        android:text="@string/systemSearchOnboardingButtonOk"
+        android:textColor="@color/cornflowerBlue"
+        android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/checkmarks" />
+
+    <Button
+        android:id="@+id/toggleButton"
+        style="?android:attr/borderlessButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="36dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="16dp"
+        android:text="@string/systemSearchOnboardingButtonMore"
+        android:textColor="@color/cornflowerBlue"
+        android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/okButton"
+        app:layout_constraintTop_toBottomOf="@id/checkmarks" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e982db6f7855..02660c890d67 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -33,4 +33,6 @@
     <dimen name="settingsItemHorizontalPadding">20dp</dimen>
     <dimen name="onboardingTitleMarginTop">20dp</dimen>
 
+    <dimen name="systemSearchResultsElevation">4dp</dimen>
+
 </resources>
\ No newline at end of file

From 8f53a3c77a369f637bb008521a53e87b430df7a2 Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Sat, 7 Mar 2020 12:43:08 +0000
Subject: [PATCH 15/20] Add tests

---
 .../systemsearch/SystemSearchViewModelTest.kt | 57 ++++++++++++++++++-
 1 file changed, 56 insertions(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt
index eada96aea1fb..15e85c650d4d 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt
@@ -76,6 +76,56 @@ class SystemSearchViewModelTest {
         testee.command.removeObserver(commandObserver)
     }
 
+    @Test
+    fun whenOnboardingShouldNotShowThenViewIsNotVisibleAndUnexpanded() = runBlockingTest {
+        whenever(mockOnboardingStore.shouldShow).thenReturn(false)
+        testee.resetViewState()
+
+        val viewState = testee.onboardingViewState.value
+        assertFalse(viewState!!.visibile)
+        assertFalse(viewState!!.expanded)
+    }
+
+    @Test
+    fun whenOnboardingShouldShowThenViewIsVisibleAndUnexpanded() = runBlockingTest {
+        whenever(mockOnboardingStore.shouldShow).thenReturn(true)
+        testee.resetViewState()
+
+        val viewState = testee.onboardingViewState.value
+        assertTrue(viewState!!.visibile)
+        assertFalse(viewState!!.expanded)
+    }
+
+
+    @Test
+    fun whenOnboardingIsUnexpandedAndUserPressesToggleThenItIsExpanded() = runBlockingTest {
+        whenOnboardingShowing()
+        testee.userTappedOnboardingToggle()
+
+        val viewState = testee.onboardingViewState.value
+        assertTrue(viewState!!.expanded)
+    }
+
+    @Test
+    fun whenOnboardingIsExpandedAndUserPressesToggleThenItIsUnexpanded() = runBlockingTest {
+        whenOnboardingShowing()
+        testee.userTappedOnboardingToggle() // first press to expand
+        testee.userTappedOnboardingToggle() // second press to minimize
+
+        val viewState = testee.onboardingViewState.value
+        assertFalse(viewState!!.expanded)
+    }
+
+    @Test
+    fun whenOnboardingIsDismissedThenViewHiddenAndOnboaringStoreNotified() = runBlockingTest {
+        whenOnboardingShowing()
+        testee.userDismissedOnboarding()
+
+        val viewState = testee.onboardingViewState.value
+        assertFalse(viewState!!.visibile)
+        verify(mockOnboardingStore).onboardingShown()
+    }
+
     @Test
     fun whenUserUpdatesQueryThenViewStateUpdated() = ruleRunBlockingTest {
         testee.userUpdatedQuery(QUERY)
@@ -92,7 +142,7 @@ class SystemSearchViewModelTest {
         testee.userUpdatedQuery(QUERY)
         testee.userUpdatedQuery("$QUERY ")
 
-        val newViewState = testee.viewState.value
+        val newViewState = testee.resutlsViewState.value
         assertNotNull(newViewState)
         assertEquals("$QUERY ", newViewState?.queryText)
         assertEquals(appQueryResult, newViewState?.appResults)
@@ -159,6 +209,11 @@ class SystemSearchViewModelTest {
         assertEquals(Command.ShowAppNotFoundMessage(deviceApp.shortName), commandCaptor.lastValue)
     }
 
+    private fun whenOnboardingShowing() {
+        whenever(mockOnboardingStore.shouldShow).thenReturn(true)
+        testee.resetViewState()
+    }
+
     private fun ruleRunBlockingTest(block: suspend TestCoroutineScope.() -> Unit) =
         coroutineRule.testDispatcher.runBlockingTest(block)
 

From d09423192259d62db67d9a8932a16e068ab58866 Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Sat, 7 Mar 2020 13:09:42 +0000
Subject: [PATCH 16/20] Fix typos and lint

---
 .../systemsearch/SystemSearchViewModelTest.kt    | 16 ++++++++--------
 .../com/duckduckgo/app/global/device/Device.kt   |  2 +-
 .../app/systemsearch/SystemSearchActivity.kt     |  6 +++---
 .../app/systemsearch/SystemSearchViewModel.kt    | 16 ++++++++--------
 .../layout/include_system_search_onboarding.xml  |  8 ++++----
 app/src/main/res/values/string-untranslated.xml  |  8 ++++----
 6 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt
index 15e85c650d4d..c97db727e200 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt
@@ -82,7 +82,7 @@ class SystemSearchViewModelTest {
         testee.resetViewState()
 
         val viewState = testee.onboardingViewState.value
-        assertFalse(viewState!!.visibile)
+        assertFalse(viewState!!.visible)
         assertFalse(viewState!!.expanded)
     }
 
@@ -92,7 +92,7 @@ class SystemSearchViewModelTest {
         testee.resetViewState()
 
         val viewState = testee.onboardingViewState.value
-        assertTrue(viewState!!.visibile)
+        assertTrue(viewState!!.visible)
         assertFalse(viewState!!.expanded)
     }
 
@@ -117,12 +117,12 @@ class SystemSearchViewModelTest {
     }
 
     @Test
-    fun whenOnboardingIsDismissedThenViewHiddenAndOnboaringStoreNotified() = runBlockingTest {
+    fun whenOnboardingIsDismissedThenViewHiddenAndOnboardingStoreNotified() = runBlockingTest {
         whenOnboardingShowing()
         testee.userDismissedOnboarding()
 
         val viewState = testee.onboardingViewState.value
-        assertFalse(viewState!!.visibile)
+        assertFalse(viewState!!.visible)
         verify(mockOnboardingStore).onboardingShown()
     }
 
@@ -130,7 +130,7 @@ class SystemSearchViewModelTest {
     fun whenUserUpdatesQueryThenViewStateUpdated() = ruleRunBlockingTest {
         testee.userUpdatedQuery(QUERY)
 
-        val newViewState = testee.resutlsViewState.value
+        val newViewState = testee.resultsViewState.value
         assertNotNull(newViewState)
         assertEquals(QUERY, newViewState?.queryText)
         assertEquals(appQueryResult, newViewState?.appResults)
@@ -142,7 +142,7 @@ class SystemSearchViewModelTest {
         testee.userUpdatedQuery(QUERY)
         testee.userUpdatedQuery("$QUERY ")
 
-        val newViewState = testee.resutlsViewState.value
+        val newViewState = testee.resultsViewState.value
         assertNotNull(newViewState)
         assertEquals("$QUERY ", newViewState?.queryText)
         assertEquals(appQueryResult, newViewState?.appResults)
@@ -154,7 +154,7 @@ class SystemSearchViewModelTest {
         testee.userUpdatedQuery(QUERY)
         testee.userClearedQuery()
 
-        val newViewState = testee.resutlsViewState.value
+        val newViewState = testee.resultsViewState.value
         assertNotNull(newViewState)
         assertTrue(newViewState!!.queryText.isEmpty())
         assertTrue(newViewState.appResults.isEmpty())
@@ -166,7 +166,7 @@ class SystemSearchViewModelTest {
         testee.userUpdatedQuery(QUERY)
         testee.userUpdatedQuery(BLANK_QUERY)
 
-        val newViewState = testee.resutlsViewState.value
+        val newViewState = testee.resultsViewState.value
         assertNotNull(newViewState)
         assertTrue(newViewState!!.queryText.isEmpty())
         assertTrue(newViewState.appResults.isEmpty())
diff --git a/app/src/main/java/com/duckduckgo/app/global/device/Device.kt b/app/src/main/java/com/duckduckgo/app/global/device/Device.kt
index 08cacb1bba2c..ed6fb7ec3471 100644
--- a/app/src/main/java/com/duckduckgo/app/global/device/Device.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/device/Device.kt
@@ -43,7 +43,7 @@ interface DeviceInfo {
 
 class ContextDeviceInfo @Inject constructor(private val context: Context) : DeviceInfo {
 
-    override val appVersion = "${BuildConfig.VERSION_NAME}"
+    override val appVersion = BuildConfig.VERSION_NAME
 
     override val majorAppVersion = appVersion.split(".").first()
 
diff --git a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
index d2fbaf9432f2..1a1231bf097e 100644
--- a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
@@ -95,7 +95,7 @@ class SystemSearchActivity : DuckDuckGoActivity() {
         viewModel.onboardingViewState.observe(this, Observer<SystemSearchViewModel.OnboardingViewState> {
             it?.let { renderOnboardingViewState(it) }
         })
-        viewModel.resutlsViewState.observe(this, Observer<SystemSearchResultsViewState> {
+        viewModel.resultsViewState.observe(this, Observer<SystemSearchResultsViewState> {
             it?.let { renderResultsViewState(it) }
         })
         viewModel.command.observe(this, Observer {
@@ -168,14 +168,14 @@ class SystemSearchActivity : DuckDuckGoActivity() {
     }
 
     private fun renderOnboardingViewState(viewState: SystemSearchViewModel.OnboardingViewState) {
-        if (viewState.visibile) {
+        if (viewState.visible) {
             onboarding.visibility = View.VISIBLE
             results.elevation = 0.0f
             checkmarks.visibility = if (viewState.expanded) View.VISIBLE else View.GONE
             refreshOnboardingToggleText(viewState.expanded)
         } else {
             onboarding.visibility = View.GONE
-            results.elevation = if (viewState.visibile) 0.0f else resources.getDimension(R.dimen.systemSearchResultsElevation)
+            results.elevation = if (viewState.visible) 0.0f else resources.getDimension(R.dimen.systemSearchResultsElevation)
         }
     }
 
diff --git a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt
index 0915ce221ac1..f56320280703 100644
--- a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt
@@ -42,7 +42,7 @@ class SystemSearchViewModel(
 ) : ViewModel() {
 
     data class OnboardingViewState(
-        val visibile: Boolean,
+        val visible: Boolean,
         val expanded: Boolean = false
     )
 
@@ -61,7 +61,7 @@ class SystemSearchViewModel(
     }
 
     val onboardingViewState: MutableLiveData<OnboardingViewState> = MutableLiveData()
-    val resutlsViewState: MutableLiveData<SystemSearchResultsViewState> = MutableLiveData()
+    val resultsViewState: MutableLiveData<SystemSearchResultsViewState> = MutableLiveData()
     val command: SingleLiveEvent<Command> = SingleLiveEvent()
 
     private val autoCompletePublishSubject = PublishRelay.create<String>()
@@ -77,7 +77,7 @@ class SystemSearchViewModel(
     }
 
     private fun currentOnboardingState(): OnboardingViewState = onboardingViewState.value!!
-    private fun currentResultsState(): SystemSearchResultsViewState = resutlsViewState.value!!
+    private fun currentResultsState(): SystemSearchResultsViewState = resultsViewState.value!!
 
     fun resetViewState() {
         resetOnboardingState()
@@ -85,14 +85,14 @@ class SystemSearchViewModel(
     }
 
     private fun resetOnboardingState() {
-        onboardingViewState.value = OnboardingViewState(visibile = onboardingStore.shouldShow)
+        onboardingViewState.value = OnboardingViewState(visible = onboardingStore.shouldShow)
     }
 
     private fun resetResultsState() {
         autocompleteResults = AutoCompleteResult("", emptyList())
         appsJob?.cancel()
         appResults = emptyList()
-        resutlsViewState.value = SystemSearchResultsViewState()
+        resultsViewState.value = SystemSearchResultsViewState()
     }
 
     private fun configureAutoComplete() {
@@ -114,7 +114,7 @@ class SystemSearchViewModel(
     }
 
     fun userDismissedOnboarding() {
-        onboardingViewState.value = currentOnboardingState().copy(visibile = false)
+        onboardingViewState.value = currentOnboardingState().copy(visible = false)
         onboardingStore.onboardingShown()
     }
 
@@ -131,7 +131,7 @@ class SystemSearchViewModel(
             return
         }
 
-        resutlsViewState.value = currentResultsState().copy(queryText = query)
+        resultsViewState.value = currentResultsState().copy(queryText = query)
 
         val trimmedQuery = query.trim()
         autoCompletePublishSubject.accept(trimmedQuery)
@@ -156,7 +156,7 @@ class SystemSearchViewModel(
         val updatedSuggestions = if (hasMultiResults) fullSuggestions.take(RESULTS_MAX_RESULTS_PER_GROUP) else fullSuggestions
         val updatedApps = if (hasMultiResults) appResults.take(RESULTS_MAX_RESULTS_PER_GROUP) else appResults
 
-        resutlsViewState.postValue(
+        resultsViewState.postValue(
             currentResultsState().copy(
                 autocompleteResults = AutoCompleteResult(autocompleteResults.query, updatedSuggestions),
                 appResults = updatedApps
diff --git a/app/src/main/res/layout/include_system_search_onboarding.xml b/app/src/main/res/layout/include_system_search_onboarding.xml
index f84393770953..f07d1566ca4f 100644
--- a/app/src/main/res/layout/include_system_search_onboarding.xml
+++ b/app/src/main/res/layout/include_system_search_onboarding.xml
@@ -105,7 +105,7 @@
             android:layout_marginTop="12dp"
             android:layout_marginBottom="6dp"
             android:fontFamily="sans-serif"
-            android:text="@string/systemSearchOnboaringFeaturesIntroText"
+            android:text="@string/systemSearchOnboardingFeaturesIntroText"
             android:textColor="?attr/normalTextColor"
             android:textSize="14sp"
             android:textStyle="normal" />
@@ -118,7 +118,7 @@
             android:drawableStart="@drawable/ic_success"
             android:drawablePadding="12dp"
             android:fontFamily="sans-serif"
-            android:text="@string/systemSearchOnboaringFeatureOneText"
+            android:text="@string/systemSearchOnboardingFeatureOneText"
             android:textColor="?attr/normalTextColor"
             android:textSize="14sp"
             android:textStyle="normal" />
@@ -131,7 +131,7 @@
             android:drawableStart="@drawable/ic_success"
             android:drawablePadding="12dp"
             android:fontFamily="sans-serif"
-            android:text="@string/systemSearchOnboaringFeatureTwoText"
+            android:text="@string/systemSearchOnboardingFeatureTwoText"
             android:textColor="?attr/normalTextColor"
             android:textSize="14sp"
             android:textStyle="normal" />
@@ -144,7 +144,7 @@
             android:drawableStart="@drawable/ic_success"
             android:drawablePadding="12dp"
             android:fontFamily="sans-serif"
-            android:text="@string/systemSearchOnboaringFeatureThreeText"
+            android:text="@string/systemSearchOnboardingFeatureThreeText"
             android:textColor="?attr/normalTextColor"
             android:textSize="14sp"
             android:textStyle="normal" />
diff --git a/app/src/main/res/values/string-untranslated.xml b/app/src/main/res/values/string-untranslated.xml
index 9fdfd4b1c7f8..107c32293555 100644
--- a/app/src/main/res/values/string-untranslated.xml
+++ b/app/src/main/res/values/string-untranslated.xml
@@ -22,10 +22,10 @@
     <string name="systemSearchDeviceAppLabel">From this device</string>
     <string name="systemSearchAppNotFound">Application could not be found</string>
     <string name="systemSearchOnboardingText">Thanks for choosing DuckDuckGo!\nNow, when using our search or app, your searches are protected.</string>
-    <string name="systemSearchOnboaringFeaturesIntroText">The DuckDuckGo app also:</string>
-    <string name="systemSearchOnboaringFeatureOneText">Blocks unsafe trackers</string>
-    <string name="systemSearchOnboaringFeatureTwoText">Forces encryption on websites</string>
-    <string name="systemSearchOnboaringFeatureThreeText">Clears data with one tap</string>
+    <string name="systemSearchOnboardingFeaturesIntroText">The DuckDuckGo app also:</string>
+    <string name="systemSearchOnboardingFeatureOneText">Blocks unsafe trackers</string>
+    <string name="systemSearchOnboardingFeatureTwoText">Forces encryption on websites</string>
+    <string name="systemSearchOnboardingFeatureThreeText">Clears data with one tap</string>
     <string name="systemSearchOnboardingButtonMore">Show more</string>
     <string name="systemSearchOnboardingButtonLess">Hide</string>
     <string name="systemSearchOnboardingButtonOk">Got it</string>

From 21fee58ca106a867f5ea231adc3e4c847ad8ab3f Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Mon, 9 Mar 2020 12:42:50 +0000
Subject: [PATCH 17/20] Pixels and Variant

---
 .../statistics/ExperimentationVariantManagerTest.kt    | 10 +++++++++-
 .../duckduckgo/app/statistics/VariantManagerTest.kt    |  2 +-
 .../com/duckduckgo/app/statistics/VariantManager.kt    |  7 ++++++-
 .../java/com/duckduckgo/app/statistics/pixels/Pixel.kt |  4 ++++
 .../app/systemsearch/SystemSearchActivity.kt           |  4 ++++
 5 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/app/src/androidTest/java/com/duckduckgo/app/statistics/ExperimentationVariantManagerTest.kt b/app/src/androidTest/java/com/duckduckgo/app/statistics/ExperimentationVariantManagerTest.kt
index c885adb129d7..14be741efb71 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/statistics/ExperimentationVariantManagerTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/statistics/ExperimentationVariantManagerTest.kt
@@ -18,6 +18,7 @@
 
 package com.duckduckgo.app.statistics
 
+import com.duckduckgo.app.statistics.VariantManager.Companion.RESERVED_EU_AUCTION_VARIANT
 import com.duckduckgo.app.statistics.store.StatisticsDataStore
 import com.nhaarman.mockitokotlin2.*
 import org.junit.Assert.*
@@ -166,12 +167,19 @@ class ExperimentationVariantManagerTest {
     }
 
     @Test
-    fun whenReferrerVariantReturnedThenNoFeaturesEnabled() {
+    fun whenUnknownReferrerVariantReturnedThenNoFeaturesEnabled() {
         mockUpdateScenario("xx")
         val variant = testee.getVariant(activeVariants)
         assertTrue(variant.features.isEmpty())
     }
 
+    @Test
+    fun whenEuAuctionReferrerVariantReturnedThenSuppressWidgetFeaturesEnabled() {
+        mockUpdateScenario(RESERVED_EU_AUCTION_VARIANT)
+        val variant = testee.getVariant(activeVariants)
+        assertTrue(variant.hasFeature(VariantManager.VariantFeature.SuppressHomeTabWidgetCta))
+    }
+
     private fun mockUpdateScenario(key: String) {
         testee.updateAppReferrerVariant(key)
         whenever(mockStore.referrerVariant).thenReturn(key)
diff --git a/app/src/androidTest/java/com/duckduckgo/app/statistics/VariantManagerTest.kt b/app/src/androidTest/java/com/duckduckgo/app/statistics/VariantManagerTest.kt
index a7b595be6aef..0882e4853721 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/statistics/VariantManagerTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/statistics/VariantManagerTest.kt
@@ -25,7 +25,7 @@ import org.junit.Test
 class VariantManagerTest {
 
     private val variants = VariantManager.ACTIVE_VARIANTS +
-            variantWithKey(RESERVED_EU_AUCTION_VARIANT) +
+            VariantManager.REFERRER_VARIANTS +
             DEFAULT_VARIANT
 
     // SERP Experiment(s)
diff --git a/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt b/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt
index 9cd3f620ef82..9e6ce8747c36 100644
--- a/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt
+++ b/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt
@@ -84,8 +84,13 @@ interface VariantManager {
             // All groups in an experiment (control and variants) MUST use the same filters
         )
 
+        val REFERRER_VARIANTS = listOf(
+            Variant(RESERVED_EU_AUCTION_VARIANT, features = listOf(SuppressHomeTabWidgetCta), filterBy = { noFilter() })
+        )
+
         fun referrerVariant(key: String): Variant {
-            return Variant(key, features = emptyList(), filterBy = { noFilter() })
+            val knownReferrer = REFERRER_VARIANTS.firstOrNull { it.key == key }
+            return knownReferrer ?: Variant(key, features = emptyList(), filterBy = { noFilter() })
         }
 
         private fun noFilter(): Boolean = true
diff --git a/app/src/main/java/com/duckduckgo/app/statistics/pixels/Pixel.kt b/app/src/main/java/com/duckduckgo/app/statistics/pixels/Pixel.kt
index 5ebc022bb3db..d6c2a6c6c44c 100644
--- a/app/src/main/java/com/duckduckgo/app/statistics/pixels/Pixel.kt
+++ b/app/src/main/java/com/duckduckgo/app/statistics/pixels/Pixel.kt
@@ -100,6 +100,10 @@ interface Pixel {
         INTERSTITIAL_LAUNCH_BROWSER_QUERY(pixelName = "m_i_lbq"),
         INTERSTITIAL_LAUNCH_DEVICE_APP(pixelName = "m_i_sda"),
         INTERSTITIAL_LAUNCH_DAX(pixelName = "m_i_ld"),
+        INTERSTITIAL_ONBOARDING_SHOWN(pixelName = "m_io_s"),
+        INTERSTITIAL_ONBOARDING_DISMISSED(pixelName = "m_io_d"),
+        INTERSTITIAL_ONBOARDING_LESS_PRESSED(pixelName = "m_io_l"),
+        INTERSTITIAL_ONBOARDING_MORE_PRESSED(pixelName = "m_io_m"),
 
         LONG_PRESS("mlp"),
         LONG_PRESS_DOWNLOAD_IMAGE("mlp_i"),
diff --git a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
index 1a1231bf097e..510735533cbb 100644
--- a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
@@ -105,9 +105,12 @@ class SystemSearchActivity : DuckDuckGoActivity() {
 
     private fun configureOnboarding() {
         okButton.setOnClickListener {
+            pixel.fire(PixelName.INTERSTITIAL_ONBOARDING_DISMISSED)
             viewModel.userDismissedOnboarding()
         }
         toggleButton.setOnClickListener {
+            val more = toggleButton.text == getString(R.string.systemSearchOnboardingButtonMore)
+            pixel.fire(if (more) PixelName.INTERSTITIAL_ONBOARDING_MORE_PRESSED else PixelName.INTERSTITIAL_ONBOARDING_LESS_PRESSED)
             viewModel.userTappedOnboardingToggle()
         }
     }
@@ -169,6 +172,7 @@ class SystemSearchActivity : DuckDuckGoActivity() {
 
     private fun renderOnboardingViewState(viewState: SystemSearchViewModel.OnboardingViewState) {
         if (viewState.visible) {
+            pixel.fire(PixelName.INTERSTITIAL_ONBOARDING_SHOWN)
             onboarding.visibility = View.VISIBLE
             results.elevation = 0.0f
             checkmarks.visibility = if (viewState.expanded) View.VISIBLE else View.GONE

From 409d740783c0a865e6d0bdc2cb3cc2a2f19c47c6 Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Mon, 9 Mar 2020 15:53:59 +0000
Subject: [PATCH 18/20] Move pixels into view model for improved testability

---
 .../systemsearch/SystemSearchViewModelTest.kt | 32 ++++++++++++++-----
 .../duckduckgo/app/global/ViewModelFactory.kt |  2 +-
 .../app/systemsearch/SystemSearchActivity.kt  | 14 +++-----
 .../app/systemsearch/SystemSearchViewModel.kt | 17 +++++++++-
 4 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt
index c97db727e200..a14f18435b71 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt
@@ -25,6 +25,8 @@ import com.duckduckgo.app.autocomplete.api.AutoComplete
 import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteResult
 import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteSuggestion.AutoCompleteSearchSuggestion
 import com.duckduckgo.app.onboarding.store.OnboardingStore
+import com.duckduckgo.app.statistics.pixels.Pixel
+import com.duckduckgo.app.statistics.pixels.Pixel.PixelName.*
 import com.duckduckgo.app.systemsearch.SystemSearchViewModel.Command
 import com.duckduckgo.app.systemsearch.SystemSearchViewModel.Command.LaunchDuckDuckGo
 import com.nhaarman.mockitokotlin2.argumentCaptor
@@ -55,6 +57,7 @@ class SystemSearchViewModelTest {
     private val mockOnboardingStore: OnboardingStore = mock()
     private val mockDeviceAppLookup: DeviceAppLookup = mock()
     private val mockAutoComplete: AutoComplete = mock()
+    private val mockPixel: Pixel = mock()
 
     private val commandObserver: Observer<Command> = mock()
     private val commandCaptor = argumentCaptor<Command>()
@@ -67,7 +70,7 @@ class SystemSearchViewModelTest {
         whenever(mockAutoComplete.autoComplete(BLANK_QUERY)).thenReturn(Observable.just(autocompleteBlankResult))
         whenever(mockDeviceAppLookup.query(QUERY)).thenReturn(appQueryResult)
         whenever(mockDeviceAppLookup.query(BLANK_QUERY)).thenReturn(appBlankResult)
-        testee = SystemSearchViewModel(mockOnboardingStore, mockAutoComplete, mockDeviceAppLookup, coroutineRule.testDispatcherProvider)
+        testee = SystemSearchViewModel(mockOnboardingStore, mockAutoComplete, mockDeviceAppLookup, mockPixel, coroutineRule.testDispatcherProvider)
         testee.command.observeForever(commandObserver)
     }
 
@@ -96,33 +99,42 @@ class SystemSearchViewModelTest {
         assertFalse(viewState!!.expanded)
     }
 
+    @Test
+    fun whenOnboardingShownThenPixelSent() = runBlockingTest {
+        whenever(mockOnboardingStore.shouldShow).thenReturn(true)
+        testee.resetViewState()
+        verify(mockPixel).fire(INTERSTITIAL_ONBOARDING_SHOWN)
+    }
 
     @Test
-    fun whenOnboardingIsUnexpandedAndUserPressesToggleThenItIsExpanded() = runBlockingTest {
+    fun whenOnboardingIsUnexpandedAndUserPressesToggleThenItIsExpandedAndPixelSent() = runBlockingTest {
         whenOnboardingShowing()
         testee.userTappedOnboardingToggle()
 
         val viewState = testee.onboardingViewState.value
         assertTrue(viewState!!.expanded)
+        verify(mockPixel).fire(INTERSTITIAL_ONBOARDING_MORE_PRESSED)
     }
 
     @Test
-    fun whenOnboardingIsExpandedAndUserPressesToggleThenItIsUnexpanded() = runBlockingTest {
+    fun whenOnboardingIsExpandedAndUserPressesToggleThenItIsUnexpandedAndPixelSent() = runBlockingTest {
         whenOnboardingShowing()
         testee.userTappedOnboardingToggle() // first press to expand
         testee.userTappedOnboardingToggle() // second press to minimize
 
         val viewState = testee.onboardingViewState.value
         assertFalse(viewState!!.expanded)
+        verify(mockPixel).fire(INTERSTITIAL_ONBOARDING_LESS_PRESSED)
     }
 
     @Test
-    fun whenOnboardingIsDismissedThenViewHiddenAndOnboardingStoreNotified() = runBlockingTest {
+    fun whenOnboardingIsDismissedThenViewHiddenPixelSentAndOnboardingStoreNotified() = runBlockingTest {
         whenOnboardingShowing()
         testee.userDismissedOnboarding()
 
         val viewState = testee.onboardingViewState.value
         assertFalse(viewState!!.visible)
+        verify(mockPixel).fire(INTERSTITIAL_ONBOARDING_DISMISSED)
         verify(mockOnboardingStore).onboardingShown()
     }
 
@@ -174,31 +186,35 @@ class SystemSearchViewModelTest {
     }
 
     @Test
-    fun whenUserSubmitsQueryThenBrowserLaunched() {
+    fun whenUserSubmitsQueryThenBrowserLaunchedAndPixelSent() {
         testee.userSubmittedQuery(QUERY)
         verify(commandObserver, atLeastOnce()).onChanged(commandCaptor.capture())
         assertEquals(Command.LaunchBrowser(QUERY), commandCaptor.lastValue)
+        verify(mockPixel).fire(INTERSTITIAL_LAUNCH_BROWSER_QUERY)
     }
 
     @Test
-    fun whenUserSubmitsAutocompleteResultThenBrowserLaunched() {
+    fun whenUserSubmitsAutocompleteResultThenBrowserLaunchedAndPixelSent() {
         testee.userSubmittedAutocompleteResult(AUTOCOMPLETE_RESULT)
         verify(commandObserver, atLeastOnce()).onChanged(commandCaptor.capture())
         assertEquals(Command.LaunchBrowser(AUTOCOMPLETE_RESULT), commandCaptor.lastValue)
+        verify(mockPixel).fire(INTERSTITIAL_LAUNCH_BROWSER_QUERY)
     }
 
     @Test
-    fun whenUserSelectsAppResultThenAppLaunched() {
+    fun whenUserSelectsAppResultThenAppLaunchedAndPixelSent() {
         testee.userSelectedApp(deviceApp)
         verify(commandObserver, atLeastOnce()).onChanged(commandCaptor.capture())
         assertEquals(Command.LaunchDeviceApplication(deviceApp), commandCaptor.lastValue)
+        verify(mockPixel).fire(INTERSTITIAL_LAUNCH_DEVICE_APP)
     }
 
     @Test
-    fun whenUserTapsDaxThenAppLaunched() {
+    fun whenUserTapsDaxThenAppLaunchedAndPixelSent() {
         testee.userTappedDax()
         verify(commandObserver, atLeastOnce()).onChanged(commandCaptor.capture())
         assertTrue(commandCaptor.lastValue is LaunchDuckDuckGo)
+        verify(mockPixel).fire(INTERSTITIAL_LAUNCH_DAX)
     }
 
     @Test
diff --git a/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt b/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
index 6105cd9041fd..8a9f4e1f6ce7 100644
--- a/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
@@ -113,7 +113,7 @@ class ViewModelFactory @Inject constructor(
         with(modelClass) {
             when {
                 isAssignableFrom(LaunchViewModel::class.java) -> LaunchViewModel(onboardingStore, appInstallationReferrerStateListener)
-                isAssignableFrom(SystemSearchViewModel::class.java) -> SystemSearchViewModel(onboardingStore, autoCompleteApi, deviceAppLookup)
+                isAssignableFrom(SystemSearchViewModel::class.java) -> SystemSearchViewModel(onboardingStore, autoCompleteApi, deviceAppLookup, pixel)
                 isAssignableFrom(OnboardingViewModel::class.java) -> onboardingViewModel()
                 isAssignableFrom(BrowserViewModel::class.java) -> browserViewModel()
                 isAssignableFrom(BrowserTabViewModel::class.java) -> browserTabViewModel()
diff --git a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
index 510735533cbb..23c224a1af39 100644
--- a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
@@ -74,7 +74,10 @@ class SystemSearchActivity : DuckDuckGoActivity() {
         configureDaxButton()
         configureOmnibar()
         configureTextInput()
-        intent?.let { sendLaunchPixels(it) }
+
+        if (savedInstanceState == null) {
+            intent?.let { sendLaunchPixels(it) }
+        }
     }
 
     override fun onNewIntent(newIntent: Intent?) {
@@ -105,12 +108,9 @@ class SystemSearchActivity : DuckDuckGoActivity() {
 
     private fun configureOnboarding() {
         okButton.setOnClickListener {
-            pixel.fire(PixelName.INTERSTITIAL_ONBOARDING_DISMISSED)
             viewModel.userDismissedOnboarding()
         }
         toggleButton.setOnClickListener {
-            val more = toggleButton.text == getString(R.string.systemSearchOnboardingButtonMore)
-            pixel.fire(if (more) PixelName.INTERSTITIAL_ONBOARDING_MORE_PRESSED else PixelName.INTERSTITIAL_ONBOARDING_LESS_PRESSED)
             viewModel.userTappedOnboardingToggle()
         }
     }
@@ -172,14 +172,13 @@ class SystemSearchActivity : DuckDuckGoActivity() {
 
     private fun renderOnboardingViewState(viewState: SystemSearchViewModel.OnboardingViewState) {
         if (viewState.visible) {
-            pixel.fire(PixelName.INTERSTITIAL_ONBOARDING_SHOWN)
             onboarding.visibility = View.VISIBLE
             results.elevation = 0.0f
             checkmarks.visibility = if (viewState.expanded) View.VISIBLE else View.GONE
             refreshOnboardingToggleText(viewState.expanded)
         } else {
             onboarding.visibility = View.GONE
-            results.elevation = if (viewState.visible) 0.0f else resources.getDimension(R.dimen.systemSearchResultsElevation)
+            results.elevation = resources.getDimension(R.dimen.systemSearchResultsElevation)
         }
     }
 
@@ -220,19 +219,16 @@ class SystemSearchActivity : DuckDuckGoActivity() {
     }
 
     private fun launchDuckDuckGo() {
-        pixel.fire(PixelName.INTERSTITIAL_LAUNCH_DAX)
         startActivity(BrowserActivity.intent(this))
         finish()
     }
 
     private fun launchBrowser(command: LaunchBrowser) {
-        pixel.fire(PixelName.INTERSTITIAL_LAUNCH_BROWSER_QUERY)
         startActivity(BrowserActivity.intent(this, command.query))
         finish()
     }
 
     private fun launchDeviceApp(command: LaunchDeviceApplication) {
-        pixel.fire(PixelName.INTERSTITIAL_LAUNCH_DEVICE_APP)
         try {
             startActivity(command.deviceApp.launchIntent)
             finish()
diff --git a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt
index f56320280703..0fb81efbacec 100644
--- a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt
@@ -25,6 +25,8 @@ import com.duckduckgo.app.global.DefaultDispatcherProvider
 import com.duckduckgo.app.global.DispatcherProvider
 import com.duckduckgo.app.global.SingleLiveEvent
 import com.duckduckgo.app.onboarding.store.OnboardingStore
+import com.duckduckgo.app.statistics.pixels.Pixel
+import com.duckduckgo.app.statistics.pixels.Pixel.PixelName.*
 import com.jakewharton.rxrelay2.PublishRelay
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
@@ -38,6 +40,7 @@ class SystemSearchViewModel(
     private var onboardingStore: OnboardingStore,
     private val autoComplete: AutoComplete,
     private val deviceAppLookup: DeviceAppLookup,
+    private val pixel: Pixel,
     private val dispatchers: DispatcherProvider = DefaultDispatcherProvider()
 ) : ViewModel() {
 
@@ -85,7 +88,11 @@ class SystemSearchViewModel(
     }
 
     private fun resetOnboardingState() {
-        onboardingViewState.value = OnboardingViewState(visible = onboardingStore.shouldShow)
+        val showOnboarding = onboardingStore.shouldShow
+        onboardingViewState.value = OnboardingViewState(visible = showOnboarding)
+        if (showOnboarding) {
+            pixel.fire(INTERSTITIAL_ONBOARDING_SHOWN)
+        }
     }
 
     private fun resetResultsState() {
@@ -109,13 +116,17 @@ class SystemSearchViewModel(
     fun userTappedOnboardingToggle() {
         onboardingViewState.value = currentOnboardingState().copy(expanded = !currentOnboardingState().expanded)
         if (currentOnboardingState().expanded) {
+            pixel.fire(INTERSTITIAL_ONBOARDING_MORE_PRESSED)
             command.value = Command.DismissKeyboard
+        } else {
+            pixel.fire(INTERSTITIAL_ONBOARDING_LESS_PRESSED)
         }
     }
 
     fun userDismissedOnboarding() {
         onboardingViewState.value = currentOnboardingState().copy(visible = false)
         onboardingStore.onboardingShown()
+        pixel.fire(INTERSTITIAL_ONBOARDING_DISMISSED)
     }
 
     fun userUpdatedQuery(query: String) {
@@ -165,6 +176,7 @@ class SystemSearchViewModel(
     }
 
     fun userTappedDax() {
+        pixel.fire(INTERSTITIAL_LAUNCH_DAX)
         command.value = Command.LaunchDuckDuckGo
     }
 
@@ -175,14 +187,17 @@ class SystemSearchViewModel(
 
     fun userSubmittedQuery(query: String) {
         command.value = Command.LaunchBrowser(query)
+        pixel.fire(INTERSTITIAL_LAUNCH_BROWSER_QUERY)
     }
 
     fun userSubmittedAutocompleteResult(query: String) {
         command.value = Command.LaunchBrowser(query)
+        pixel.fire(INTERSTITIAL_LAUNCH_BROWSER_QUERY)
     }
 
     fun userSelectedApp(app: DeviceApp) {
         command.value = Command.LaunchDeviceApplication(app)
+        pixel.fire(INTERSTITIAL_LAUNCH_DEVICE_APP)
     }
 
     fun appNotFound(app: DeviceApp) {

From 2eb626252e7e01c4f913022d3217260345e56f03 Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Tue, 10 Mar 2020 12:12:29 +0000
Subject: [PATCH 19/20] Delete dead code, switch from post to set value and
 reduce layout margins as per PR feedback

---
 .../com/duckduckgo/app/statistics/VariantManagerTest.kt   | 5 -----
 .../java/com/duckduckgo/app/global/view/ViewExtension.kt  | 1 -
 .../duckduckgo/app/systemsearch/SystemSearchViewModel.kt  | 8 +++-----
 .../main/res/layout/include_system_search_onboarding.xml  | 8 ++++----
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/app/src/androidTest/java/com/duckduckgo/app/statistics/VariantManagerTest.kt b/app/src/androidTest/java/com/duckduckgo/app/statistics/VariantManagerTest.kt
index 0882e4853721..aade76b3d29c 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/statistics/VariantManagerTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/statistics/VariantManagerTest.kt
@@ -112,9 +112,4 @@ class VariantManagerTest {
             fail("Doubles are not equal. Expected $expected but was $actual")
         }
     }
-
-    @Suppress("SameParameterValue")
-    private fun variantWithKey(key: String): Variant {
-        return DEFAULT_VARIANT.copy(key = key)
-    }
 }
diff --git a/app/src/main/java/com/duckduckgo/app/global/view/ViewExtension.kt b/app/src/main/java/com/duckduckgo/app/global/view/ViewExtension.kt
index c7883b5eff94..278f617a4dc7 100644
--- a/app/src/main/java/com/duckduckgo/app/global/view/ViewExtension.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/view/ViewExtension.kt
@@ -81,4 +81,3 @@ fun View.hideKeyboard(): Boolean {
 
 fun Int.toDp(): Int = (this / Resources.getSystem().displayMetrics.density).toInt()
 fun Int.toPx(): Int = (this * Resources.getSystem().displayMetrics.density).toInt()
-fun Float.toPx(): Float = this * Resources.getSystem().displayMetrics.density
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt
index 0fb81efbacec..af0aacb5ed56 100644
--- a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt
@@ -167,11 +167,9 @@ class SystemSearchViewModel(
         val updatedSuggestions = if (hasMultiResults) fullSuggestions.take(RESULTS_MAX_RESULTS_PER_GROUP) else fullSuggestions
         val updatedApps = if (hasMultiResults) appResults.take(RESULTS_MAX_RESULTS_PER_GROUP) else appResults
 
-        resultsViewState.postValue(
-            currentResultsState().copy(
-                autocompleteResults = AutoCompleteResult(autocompleteResults.query, updatedSuggestions),
-                appResults = updatedApps
-            )
+        resultsViewState.value = currentResultsState().copy(
+            autocompleteResults = AutoCompleteResult(autocompleteResults.query, updatedSuggestions),
+            appResults = updatedApps
         )
     }
 
diff --git a/app/src/main/res/layout/include_system_search_onboarding.xml b/app/src/main/res/layout/include_system_search_onboarding.xml
index f07d1566ca4f..2c605ecee8c8 100644
--- a/app/src/main/res/layout/include_system_search_onboarding.xml
+++ b/app/src/main/res/layout/include_system_search_onboarding.xml
@@ -50,9 +50,9 @@
         android:id="@+id/onboardingTitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="42dp"
+        android:layout_marginStart="16dp"
         android:layout_marginTop="2dp"
-        android:layout_marginEnd="42dp"
+        android:layout_marginEnd="16dp"
         android:layout_marginBottom="12dp"
         android:fontFamily="sans-serif"
         android:gravity="center"
@@ -69,9 +69,9 @@
         android:id="@+id/onboardingText"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="42dp"
+        android:layout_marginStart="16dp"
         android:layout_marginTop="6dp"
-        android:layout_marginEnd="42dp"
+        android:layout_marginEnd="16dp"
         android:layout_marginBottom="12dp"
         android:fontFamily="sans-serif"
         android:gravity="center"

From c4f4759d697d08733cda443402e3d7b78024d041 Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Tue, 10 Mar 2020 12:49:04 +0000
Subject: [PATCH 20/20] Revert setValue as we do access this from a background
 thread

---
 .../duckduckgo/app/systemsearch/SystemSearchViewModel.kt  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt
index af0aacb5ed56..0fb81efbacec 100644
--- a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt
@@ -167,9 +167,11 @@ class SystemSearchViewModel(
         val updatedSuggestions = if (hasMultiResults) fullSuggestions.take(RESULTS_MAX_RESULTS_PER_GROUP) else fullSuggestions
         val updatedApps = if (hasMultiResults) appResults.take(RESULTS_MAX_RESULTS_PER_GROUP) else appResults
 
-        resultsViewState.value = currentResultsState().copy(
-            autocompleteResults = AutoCompleteResult(autocompleteResults.query, updatedSuggestions),
-            appResults = updatedApps
+        resultsViewState.postValue(
+            currentResultsState().copy(
+                autocompleteResults = AutoCompleteResult(autocompleteResults.query, updatedSuggestions),
+                appResults = updatedApps
+            )
         )
     }