morgan pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser

Commits:

26 changed files:

Changes:

  • mobile/android/fenix/app/src/beta/res/drawable-anydpi-v24/ic_tor_browser_close_tabs_notification.xml
    1 
    +<vector xmlns:android="http://schemas.android.com/apk/res/android"
    2 
    +    android:width="24dp"
    3 
    +    android:height="24dp"
    4 
    +    android:viewportWidth="256"
    5 
    +    android:viewportHeight="257"
    6 
    +    android:tint="#FFFFFF">
    7 
    +  <group android:scaleX="1.84"
    8 
    +      android:scaleY="1.84"
    9 
    +      android:translateX="-107.52"
    10 
    +      android:translateY="-107.94">
    11 
    +    <group android:scaleX="0.4869866"
    12 
    +        android:scaleY="0.4888889"
    13 
    +        android:translateX="65.66572"
    14 
    +        android:translateY="65.67778">
    15 
    +      <path
    16 
    +          android:pathData="M62.56,111.94C67,111.94 70.72,110.38 73.92,107.17C77.13,103.96 78.68,99.93 78.68,94.86C78.68,90.5 77.04,86.73 73.65,83.34L73.63,83.32C70.34,79.95 66.63,78.31 62.29,78.31C58.59,78.31 55.28,79.9 52.17,83.17C49.12,86.38 47.63,90.16 47.63,94.72C47.63,97.37 47.99,99.8 48.7,101.94C49.48,104.04 50.53,105.88 51.84,107.43C53.11,108.84 54.66,109.98 56.45,110.81C58.27,111.56 60.33,111.94 62.56,111.94Z"
    17 
    +          android:fillColor="#4A454E"/>
    18 
    +      <path
    19 
    +          android:pathData="M128,256.91C198.69,256.91 256,199.6 256,128.91C256,58.22 198.69,0.91 128,0.91C57.31,0.91 0,58.22 0,128.91C0,199.6 57.31,256.91 128,256.91ZM233,128.91C233,70.92 185.99,23.91 128,23.91V39.91C177.15,39.91 217,79.75 217,128.91C217,178.06 177.15,217.91 128,217.91V233.91C185.99,233.91 233,186.9 233,128.91ZM193.75,128.91C193.75,92.6 164.31,63.16 128,63.16V79.16C155.48,79.16 177.75,101.43 177.75,128.91C177.75,156.38 155.48,178.66 128,178.66V194.66C164.31,194.66 193.75,165.22 193.75,128.91ZM128,101.66C143.05,101.66 155.25,113.86 155.25,128.91C155.25,143.96 143.05,156.16 128,156.16V101.66ZM90.71,94.86C90.71,102.56 93.36,108.02 98.8,111.54C100.29,112.5 101.06,114.24 100.75,115.96L99.93,120.5C99.68,121.87 98.79,123.03 97.53,123.61C96.29,124.18 94.9,124.11 93.71,123.42C89.35,120.88 86.16,117.89 84.18,114.5C82.28,116.93 79.87,119.01 76.97,120.71L76.97,120.72L76.75,120.84C72.29,123.36 67.51,124.64 62.56,124.64C53.76,124.64 46.62,121.63 41.34,115.68L41.3,115.63C36.54,110.19 34.13,103.15 34.13,94.72C34.13,87.5 36.44,81.01 40.98,75.43L41.23,75.12L41.48,74.83C46.84,68.62 53.54,65.47 62.56,65.47C71.58,65.47 78.82,68.88 84.13,75.62C86.04,71.65 89.25,68.27 93.74,65.52C94.97,64.77 96.45,64.71 97.73,65.34C99.04,66 99.91,67.26 100.05,68.73L100.51,73.51C100.64,74.82 100.16,76.11 99.2,77.03C93.49,82.51 90.71,88.34 90.71,94.86Z"
    20 
    +          android:fillColor="#4A454E"
    21 
    +          android:fillType="evenOdd"/>
    22 
    +    </group>
    23 
    +  </group>
    24 
    +</vector>

  • mobile/android/fenix/app/src/beta/res/drawable-hdpi/ic_tor_browser_close_tabs_notification.png
    No preview for this file type
  • mobile/android/fenix/app/src/beta/res/drawable-mdpi/ic_tor_browser_close_tabs_notification.png
    No preview for this file type
  • mobile/android/fenix/app/src/beta/res/drawable-xhdpi/ic_tor_browser_close_tabs_notification.png
    No preview for this file type
  • mobile/android/fenix/app/src/beta/res/drawable-xxhdpi/ic_tor_browser_close_tabs_notification.png
    No preview for this file type
  • mobile/android/fenix/app/src/beta/res/values/colors.xml
    ... ... @@ -4,4 +4,5 @@
    4 4 
        - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
    5 5 
     <resources>
    6 6 
         <color name="ic_launcher_background">@color/photonInk80</color>
    7 
    +    <color name="tor_browser_close_tabs_notification_background">#2B8B76</color>
    7 8 
     </resources>

  • mobile/android/fenix/app/src/debug/res/drawable-anydpi-v24/ic_tor_browser_close_tabs_notification.xml
    1 
    +<vector xmlns:android="http://schemas.android.com/apk/res/android"
    2 
    +    android:width="24dp"
    3 
    +    android:height="24dp"
    4 
    +    android:viewportWidth="256"
    5 
    +    android:viewportHeight="257"
    6 
    +    android:tint="#FFFFFF">
    7 
    +  <group android:scaleX="0.9164202"
    8 
    +      android:scaleY="0.92"
    9 
    +      android:translateX="10.69821"
    10 
    +      android:translateY="10.28">
    11 
    +    <path
    12 
    +        android:pathData="M128,256.91C198.69,256.91 256,199.6 256,128.91C256,58.22 198.69,0.91 128,0.91C57.31,0.91 0,58.22 0,128.91C0,199.6 57.31,256.91 128,256.91ZM233,128.91C233,70.92 185.99,23.91 128,23.91V39.91C177.15,39.91 217,79.75 217,128.91C217,178.06 177.15,217.91 128,217.91V233.91C185.99,233.91 233,186.9 233,128.91ZM193.75,128.91C193.75,92.6 164.31,63.16 128,63.16V79.16C155.48,79.16 177.75,101.43 177.75,128.91C177.75,156.38 155.48,178.66 128,178.66V194.66C164.31,194.66 193.75,165.22 193.75,128.91ZM128,101.66C143.05,101.66 155.25,113.86 155.25,128.91C155.25,143.96 143.05,156.16 128,156.16V101.66ZM94.04,61.23C94.36,61.18 94.46,60.77 94.2,60.59C89.25,57.25 83.29,55.31 76.87,55.31C59.75,55.31 45.87,69.16 45.87,86.24C45.87,103.33 59.75,117.18 76.87,117.18C84.6,117.18 91.66,114.35 97.09,109.69C97.34,109.48 97.19,109.08 96.86,109.07C83.98,108.56 73.7,97.99 73.7,85.01C73.7,73 82.52,63.04 94.04,61.23Z"
    13 
    +        android:fillColor="#4A454E"
    14 
    +        android:fillType="evenOdd"/>
    15 
    +  </group>
    16 
    +</vector>

  • mobile/android/fenix/app/src/debug/res/drawable-hdpi/ic_tor_browser_close_tabs_notification.png
    No preview for this file type
  • mobile/android/fenix/app/src/debug/res/drawable-mdpi/ic_tor_browser_close_tabs_notification.png
    No preview for this file type
  • mobile/android/fenix/app/src/debug/res/drawable-xhdpi/ic_tor_browser_close_tabs_notification.png
    No preview for this file type
  • mobile/android/fenix/app/src/debug/res/drawable-xxhdpi/ic_tor_browser_close_tabs_notification.png
    No preview for this file type
  • mobile/android/fenix/app/src/debug/res/values/colors.xml
    ... ... @@ -4,4 +4,5 @@
    4 4 
        - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
    5 5 
     <resources>
    6 6 
         <color name="ic_launcher_background">#220033</color>
    7 
    +    <color name="tor_browser_close_tabs_notification_background">#556472</color>
    7 8 
     </resources>

  • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/session/PrivateNotificationService.kt
    ... ... @@ -37,18 +37,27 @@ class PrivateNotificationService : AbstractPrivateNotificationService() {
    37 37 
         override val notificationsDelegate: NotificationsDelegate by lazy { components.notificationsDelegate }
    38 38
    39 39 
         override fun NotificationCompat.Builder.buildNotification() {
    40 
    -        setSmallIcon(R.drawable.ic_private_browsing)
    40 
    +        setSmallIcon(R.drawable.ic_tor_browser_close_tabs_notification)
    41 41
    42 42 
             val contentTitle = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
    43 
    -            applicationContext.getString(R.string.notification_erase_title_android_14)
    43 
    +            applicationContext.getString(
    44 
    +                R.string.notification_close_tor_browser_tabs,
    45 
    +                applicationContext.getString(R.string.app_name),
    46 
    +            )
    44 47 
             } else {
    45 48 
                 applicationContext.getString(R.string.app_name_private_4, getString(R.string.app_name))
    46 49 
             }
    47 50
    48 51 
             val contentText = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
    49 
    -            applicationContext.getString(R.string.notification_erase_text_android_14)
    52 
    +            applicationContext.getString(
    53 
    +                R.string.notification_close_tor_browser_tabs_long,
    54 
    +                applicationContext.getString(R.string.app_name),
    55 
    +            )
    50 56 
             } else {
    51 
    -            applicationContext.getString(R.string.notification_pbm_delete_text_2)
    57 
    +            applicationContext.getString(
    58 
    +                R.string.notification_close_tor_browser_tabs,
    59 
    +                applicationContext.getString(R.string.app_name),
    60 
    +            )
    52 61 
             }
    53 62
    54 63 
             setContentTitle(contentTitle)
    ... ... @@ -56,7 +65,7 @@ class PrivateNotificationService : AbstractPrivateNotificationService() {
    56 65
    57 66 
             color = ContextCompat.getColor(
    58 67 
                 this@PrivateNotificationService,
    59 
    -            R.color.pbm_notification_color,
    68 
    +            R.color.tor_browser_close_tabs_notification_background,
    60 69 
             )
    61 70 
         }
    62 71

  • mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml
    ... ... @@ -137,4 +137,10 @@
    137 137 
         <!-- Connection assist. Content Description for back button. Button will start the connection assist process again -->
    138 138 
         <string name="connection_assist_back_button_content_description_start_again">Start again</string>
    139 139
    140 
    +
    141 
    +    <!-- "Close %s's tabs?"   -->
    142 
    +    <string name="notification_close_tor_browser_tabs">Close %s’s tabs?</string>
    143 
    +    <!-- "Close %s's tabs? (long)"   -->
    144 
    +    <string name="notification_close_tor_browser_tabs_long">Tap or swipe this notification to close %s’s tabs</string>
    145 
    +
    140 146 
     </resources>

  • mobile/android/fenix/app/src/nightly/res/drawable-anydpi-v24/ic_tor_browser_close_tabs_notification.xml
    1 
    +<vector xmlns:android="http://schemas.android.com/apk/res/android"
    2 
    +    android:width="24dp"
    3 
    +    android:height="24dp"
    4 
    +    android:viewportWidth="256"
    5 
    +    android:viewportHeight="257"
    6 
    +    android:tint="#FFFFFF">
    7 
    +  <group android:scaleX="1.84"
    8 
    +      android:scaleY="1.84"
    9 
    +      android:translateX="-107.52"
    10 
    +      android:translateY="-107.94">
    11 
    +    <group android:scaleX="0.4869866"
    12 
    +        android:scaleY="0.4888889"
    13 
    +        android:translateX="65.66572"
    14 
    +        android:translateY="65.67778">
    15 
    +      <path
    16 
    +          android:pathData="M128,256.91C198.69,256.91 256,199.6 256,128.91C256,58.22 198.69,0.91 128,0.91C57.31,0.91 0,58.22 0,128.91C0,199.6 57.31,256.91 128,256.91ZM233,128.91C233,70.92 185.99,23.91 128,23.91V39.91C177.15,39.91 217,79.75 217,128.91C217,178.06 177.15,217.91 128,217.91V233.91C185.99,233.91 233,186.9 233,128.91ZM193.75,128.91C193.75,92.6 164.31,63.16 128,63.16V79.16C155.48,79.16 177.75,101.43 177.75,128.91C177.75,156.38 155.48,178.66 128,178.66V194.66C164.31,194.66 193.75,165.22 193.75,128.91ZM128,101.66C143.05,101.66 155.25,113.86 155.25,128.91C155.25,143.96 143.05,156.16 128,156.16V101.66ZM94.04,61.23C94.36,61.18 94.46,60.77 94.2,60.59C89.25,57.25 83.29,55.31 76.87,55.31C59.75,55.31 45.87,69.16 45.87,86.24C45.87,103.33 59.75,117.18 76.87,117.18C84.6,117.18 91.66,114.35 97.09,109.69C97.34,109.48 97.19,109.08 96.86,109.07C83.98,108.56 73.7,97.99 73.7,85.01C73.7,73 82.52,63.04 94.04,61.23Z"
    17 
    +          android:fillColor="#4A454E"
    18 
    +          android:fillType="evenOdd"/>
    19 
    +    </group>
    20 
    +  </group>
    21 
    +</vector>

  • mobile/android/fenix/app/src/nightly/res/drawable-hdpi/ic_tor_browser_close_tabs_notification.png
    No preview for this file type
  • mobile/android/fenix/app/src/nightly/res/drawable-mdpi/ic_tor_browser_close_tabs_notification.png
    No preview for this file type
  • mobile/android/fenix/app/src/nightly/res/drawable-xhdpi/ic_tor_browser_close_tabs_notification.png
    No preview for this file type
  • mobile/android/fenix/app/src/nightly/res/drawable-xxhdpi/ic_tor_browser_close_tabs_notification.png
    No preview for this file type
  • mobile/android/fenix/app/src/nightly/res/values/colors.xml
    ... ... @@ -4,4 +4,5 @@
    4 4 
        - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
    5 5 
     <resources>
    6 6 
         <color name="ic_launcher_background">#220033</color>
    7 
    +    <color name="tor_browser_close_tabs_notification_background">#3731A1</color>
    7 8 
     </resources>

  • mobile/android/fenix/app/src/release/res/drawable-anydpi-v24/ic_tor_browser_close_tabs_notification.xml
    1 
    +<vector xmlns:android="http://schemas.android.com/apk/res/android"
    2 
    +    android:width="24dp"
    3 
    +    android:height="24dp"
    4 
    +    android:viewportWidth="256"
    5 
    +    android:viewportHeight="257"
    6 
    +    android:tint="#FFFFFF">
    7 
    +  <group android:scaleX="1.84"
    8 
    +      android:scaleY="1.84"
    9 
    +      android:translateX="-107.52"
    10 
    +      android:translateY="-107.94">
    11 
    +    <group android:scaleX="0.4869866"
    12 
    +        android:scaleY="0.4888889"
    13 
    +        android:translateX="65.66572"
    14 
    +        android:translateY="65.67778">
    15 
    +      <path
    16 
    +          android:pathData="M256,128.91C256,199.6 198.69,256.91 128,256.91C57.31,256.91 0,199.6 0,128.91C0,58.22 57.31,0.91 128,0.91C198.69,0.91 256,58.22 256,128.91ZM128,23.91C185.99,23.91 233,70.92 233,128.91C233,186.9 185.99,233.91 128,233.91V217.91C177.15,217.91 217,178.06 217,128.91C217,79.75 177.15,39.91 128,39.91V23.91ZM128,63.16C164.31,63.16 193.75,92.6 193.75,128.91C193.75,165.22 164.31,194.66 128,194.66V178.66C155.48,178.66 177.75,156.38 177.75,128.91C177.75,101.43 155.48,79.16 128,79.16V63.16ZM155.25,128.91C155.25,113.86 143.05,101.66 128,101.66V156.16C143.05,156.16 155.25,143.96 155.25,128.91Z"
    17 
    +          android:fillColor="#4A454E"
    18 
    +          android:fillType="evenOdd"/>
    19 
    +    </group>
    20 
    +  </group>
    21 
    +</vector>

  • mobile/android/fenix/app/src/release/res/drawable-hdpi/ic_tor_browser_close_tabs_notification.png
    No preview for this file type
  • mobile/android/fenix/app/src/release/res/drawable-mdpi/ic_tor_browser_close_tabs_notification.png
    No preview for this file type
  • mobile/android/fenix/app/src/release/res/drawable-xhdpi/ic_tor_browser_close_tabs_notification.png
    No preview for this file type
  • mobile/android/fenix/app/src/release/res/drawable-xxhdpi/ic_tor_browser_close_tabs_notification.png
    No preview for this file type
  • mobile/android/fenix/app/src/release/res/values/colors.xml
    ... ... @@ -4,4 +4,5 @@
    4 4 
        - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
    5 5 
     <resources>
    6 6 
         <color name="ic_launcher_background">@color/photonInk80</color>
    7 
    +    <color name="tor_browser_close_tabs_notification_background">#701498</color>
    7 8 
     </resources>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/87c721a5889b1a2c4ecf9658afe72f78077fe8be...c8457722e9c9e89e6ba45cc2545fa22045b02732 at 1755188482