Merge branch 'release/5.247.0'

Author: github-actions[bot]

.github/workflows/release_upload.yml

@@ -0,0 +1,28 @@
+name: Release - Production Release to Play Store and Github
+
+on:
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: 'Ref to build APK from (branch, tag, commit)'
+        required: true
+
+env:
+  ASANA_PAT: ${{ secrets.ASANA_ACCESS_TOKEN }}
+  GH_TOKEN: ${{ secrets.GT_DAXMOBILE }}
+  GOOGLE_APPLICATION_CREDENTIALS: '#{ENV["HOME"]}/jenkins_static/com.duckduckgo.mobile.android/ddg-upload-firebase.json'
+  emoji_info: ":information_source:" # ℹ️
+  emoji_end: ":flight_arrival:" # 🛫
+
+jobs:
+  release-play-store:
+    name: Publish Release to Play Store
+    uses: ./.github/workflows/release_upload_play_store.yml
+    with:
+      ref: ${{ github.event.inputs.ref }}
+
+  release-internal:
+    name: Publish Internal Release to Play Store and Firebase
+    needs: release-play-store
+    if: needs.release-play-store.result == 'success'
+    uses: ./.github/workflows/release_upload_internal.yml

.github/workflows/release_nightly.yml renamed to .github/workflows/release_upload_internal.yml

@@ -1,8 +1,9 @@
-name: Release - Nightly Release to Internal and Firebase
+name: Release to Internal and Firebase
 
 on:
   schedule:
     - cron: '0 2 * * *' # run at 3 AM UTC
+  workflow_call:
   workflow_dispatch:
 
 env:
@@ -12,7 +13,7 @@ env:
 
 jobs:
   create-tag:
-    name: Generate and upload nightly bundle to Play Store Internal track
+    name: Generate and upload bundle to Play Store Internal track
     runs-on: ubuntu-latest
 
     steps:
@@ -58,8 +59,8 @@ jobs:
       - name: Notify if no changes
         if: steps.check_for_changes.outputs.has_changes == 'false'
         run: |
-          echo "No new commits since the last tag. Skipping nightly release."
-          echo "No new commits since the last tag. Skipping nightly release." >> $GITHUB_STEP_SUMMARY
+          echo "No new commits since the last tag. Skipping internal release."
+          echo "No new commits since the last tag. Skipping internal release." >> $GITHUB_STEP_SUMMARY
           exit 0   
 
       - name: Decode upload keys
@@ -104,13 +105,13 @@ jobs:
           NETP_DEBUG_SERVER_TOKEN: ${{ secrets.NETP_DEBUG_SERVER_TOKEN }}
           MALICIOUS_SITE_PROTECTION_AUTH_TOKEN: ${{ secrets.MALICIOUS_SITE_PROTECTION_AUTH_TOKEN }}
         if: steps.check_for_changes.outputs.has_changes == 'true'
-        run: ./gradlew bundleInternalRelease -PversionNameSuffix=-nightly -PuseUploadSigning -PlatestTag=${{ steps.get_latest_tag.outputs.latest_tag }} -Pbuild-date-time
+        run: ./gradlew bundleInternalRelease -PversionNameSuffix=-internal -PuseUploadSigning -PlatestTag=${{ steps.get_latest_tag.outputs.latest_tag }} -Pbuild-date-time
 
-      - name: Generate nightly version name
+      - name: Generate internal version name
         if: steps.check_for_changes.outputs.has_changes == 'true'
         id: generate_version_name
         run: |
-          output=$(./gradlew --no-configuration-cache getBuildVersionName -PversionNameSuffix=-nightly -PlatestTag=${{ steps.get_latest_tag.outputs.latest_tag }} --quiet | tail -n 1)
+          output=$(./gradlew --no-configuration-cache getBuildVersionName -PversionNameSuffix=-internal -PlatestTag=${{ steps.get_latest_tag.outputs.latest_tag }} --quiet | tail -n 1)
           echo "version=$output" >> $GITHUB_OUTPUT
 
       - name: Capture App Bundle Path
@@ -126,12 +127,12 @@ jobs:
         run: |
           bundle exec fastlane deploy_dogfood aab_path:${{ steps.capture_output.outputs.bundle_path }}
 
-      - name: Tag Nightly release
+      - name: Tag Internal Release
         if: steps.check_for_changes.outputs.has_changes == 'true'
-        id: tag_nightly_release
+        id: tag_internal_release
         run: |
           git checkout develop
-          git tag -a ${{ steps.generate_version_name.outputs.version }} -m "Create tag ${{ steps.generate_version_name.outputs.version }} for nightly release."
+          git tag -a ${{ steps.generate_version_name.outputs.version }} -m "Create tag ${{ steps.generate_version_name.outputs.version }} for internal release."
           git push origin ${{ steps.generate_version_name.outputs.version }}
 
       - name: Upload APK as artifact
@@ -144,14 +145,14 @@ jobs:
       - name: Set successful summary
         if: steps.check_for_changes.outputs.has_changes == 'true'
         run: |
-          echo "### Nightly release completed! :rocket:" >> $GITHUB_STEP_SUMMARY
+          echo "### Internal release completed! :rocket:" >> $GITHUB_STEP_SUMMARY
 
       - name: Install dependencies for create-asana-release task
         run: |
           python -m pip install --upgrade pip
           pip install -r scripts/release/requirements.txt
 
-      - name: Create Asana nightly release task
+      - name: Create Asana internal release task
         if: steps.check_for_changes.outputs.has_changes == 'true'
         env:
           ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }}
@@ -174,6 +175,6 @@ jobs:
           asana-pat: ${{ secrets.ASANA_ACCESS_TOKEN }}
           asana-project: ${{ vars.GH_ANDROID_APP_PROJECT_ID }}
           asana-section: ${{ vars.GH_ANDROID_APP_INCOMING_SECTION_ID }}
-          asana-task-name: GH Workflow Failure - Nightly Release
-          asana-task-description: The Nightly Release Task workflow has failed. See https://github.com/duckduckgo/Android/actions/runs/${{ github.run_id }}
+          asana-task-name: GH Workflow Failure - Internal Release
+          asana-task-description: The Internal Release Task workflow has failed. See https://github.com/duckduckgo/Android/actions/runs/${{ github.run_id }}
           action: 'create-asana-task'

.github/workflows/release_upload_play_store.yml

@@ -1,6 +1,13 @@
-name: Release - Production Release to Play Store and Github
+name: Production Release to Play Store and Github
 
 on:
+  workflow_call:
+    inputs:
+      ref:
+        description: 'Ref to build APK from (branch, tag, commit)'
+        type: string
+        required: true
+
   workflow_dispatch:
     inputs:
       ref:

.maestro/input_screen/input_screen_chat_mode.yaml

@@ -26,7 +26,7 @@ tags:
       - tapOn:
           text: "Duck.ai"
       - assertVisible:
-          text: "Ask Duck.ai"
+          text: "Ask privately"
       - inputText: "hey"
       - tapOn:
           id: "actionSend"

.maestro/shared/browser_screen/click_on_privacy_shield.yaml

@@ -9,28 +9,14 @@ appId: com.duckduckgo.mobile.android
 # I tried using the "point" and "leftOf" selector features to click the shield directly, the former is a known issue (https://github.com/mobile-dev-inc/Maestro/issues/1421)
 # and trying to click to the left of the input text field didn't work for me either.
 #
-# To work around this, when view_new_omnibar is used, we tap on the Omnibar icon container
+# To work around this, we tap on the Omnibar icon container
 # which aligns with the shield and has a non-zero size because of an invisible pulse animation placeholder that's within it.
-# That shield animation placeholder is in a different place for the view_fade_omnibar, so we're using a conditional flow to handle both cases.
-
-# flow for view_new_omnibar
-- runFlow:
-      when:
-          notVisible:
-              id: "com.duckduckgo.mobile.android:id/shieldIconPulseAnimationContainer"
-      commands:
-          - assertVisible:
-              id: "com.duckduckgo.mobile.android:id/shieldIcon"
-          - tapOn:
-              id: "com.duckduckgo.mobile.android:id/omnibarIconContainer"
-
-# flow for view_fade_omnibar
 - runFlow:
       when:
           visible:
               id: "com.duckduckgo.mobile.android:id/shieldIconPulseAnimationContainer"
       commands:
           - assertVisible:
-                id: "com.duckduckgo.mobile.android:id/shieldIconExperiment"
+                id: "com.duckduckgo.mobile.android:id/shieldIcon"
           - tapOn:
                 id: "com.duckduckgo.mobile.android:id/shieldIconPulseAnimationContainer"

app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/newtab/AppTrackingProtectionStateView.kt

@@ -17,13 +17,15 @@
 package com.duckduckgo.mobile.android.vpn.ui.newtab
 
 import android.content.Context
+import android.os.Build
 import android.util.AttributeSet
 import android.view.View
 import android.widget.FrameLayout
 import androidx.core.text.HtmlCompat
 import androidx.lifecycle.*
 import com.duckduckgo.anvil.annotations.ContributesActivePlugin
 import com.duckduckgo.anvil.annotations.InjectWith
+import com.duckduckgo.common.ui.view.addBottomShadow
 import com.duckduckgo.common.ui.view.gone
 import com.duckduckgo.common.ui.view.show
 import com.duckduckgo.common.ui.viewbinding.viewBinding
@@ -90,6 +92,10 @@ class AppTrackingProtectionStateView @JvmOverloads constructor(
         deviceShieldPixels.didShowNewTabSummary()
 
         configureViewReferences()
+
+        if (Build.VERSION.SDK_INT >= 28) {
+            binding.root.addBottomShadow()
+        }
     }
 
     override fun onDetachedFromWindow() {

app-tracking-protection/vpn-impl/src/main/res/layout/fragment_device_shield_cta.xml

@@ -1,41 +1,49 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/deviceShieldCtaLayout"
+<com.google.android.material.card.MaterialCardView
+    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:orientation="horizontal"
+    android:id="@+id/deviceShieldCtaLayout"
+    style="@style/Widget.DuckDuckGo.MessageCta"
+    android:clipChildren="false"
     tools:visibility="visible"
-    android:visibility="gone"
-    style="@style/Widget.DuckDuckGo.Card">
+    android:visibility="gone">
 
-    <com.duckduckgo.common.ui.view.text.DaxTextView
-        android:id="@+id/deviceShieldCtaHeader"
-        android:layout_width="0dp"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:layout_marginStart="22dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/deviceShieldCtaImage"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:typography="body2"
-        tools:text="App Tracking Protection is enabled and blocking tracking attempts across your apps" />
+        android:orientation="horizontal">
+
+        <com.duckduckgo.common.ui.view.text.DaxTextView
+            android:id="@+id/deviceShieldCtaHeader"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginStart="22dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/deviceShieldCtaImage"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:typography="body2"
+            tools:text="App Tracking Protection is enabled and blocking tracking attempts across your apps" />
+
+        <ImageView
+            android:id="@+id/deviceShieldCtaImage"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            android:scaleType="centerCrop"
+            android:src="@drawable/ic_apptp_default"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="ContentDescription" />
 
-    <ImageView
-        android:id="@+id/deviceShieldCtaImage"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:scaleType="centerCrop"
-        android:src="@drawable/ic_apptp_default"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="ContentDescription" />
 
+    </LinearLayout>
 
-</LinearLayout>
+</com.google.android.material.card.MaterialCardView>

app/build.gradle

@@ -406,6 +406,9 @@ dependencies {
     implementation project(':dax-prompts-api')
     implementation project(':dax-prompts-impl')
 
+    implementation project(':serp-logos-api')
+    implementation project(':serp-logos-impl')
+
     // Deprecated. TODO: Stop using this artifact.
     implementation "androidx.legacy:legacy-support-v4:_"
     debugImplementation Square.leakCanary.android