Skip to content
Open
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ class AppBrandDesignUpdatePreWarmObserver @Inject constructor(
appCoroutineScope.launch(dispatcherProvider.io()) {
toggles.theme().isEnabled()
toggles.addressBar().isEnabled()
toggles.pictograms().isEnabled()
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,11 @@ interface AppBrandDesignUpdateToggles {
*/
@Toggle.DefaultValue(DefaultFeatureValue.INTERNAL)
fun addressBar(): Toggle

/**
* Gates pictogram swaps that change drawable type or call-site behaviour, plus the rebranded
* home screen widget styling. The remaining pictogram swaps are flavour-gated.
*/
@Toggle.DefaultValue(DefaultFeatureValue.INTERNAL)
fun pictograms(): Toggle
}
31 changes: 31 additions & 0 deletions app/src/internal/res/drawable/ad_blocking_header_128.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="128dp"
android:height="96dp"
android:viewportWidth="128"
android:viewportHeight="96">
<path
android:pathData="M61.04,25.99C69.49,24.9 77.78,24.26 85.82,24.03C88.78,23.94 91.44,25.8 92.27,28.64C93.66,33.44 94.74,38.56 95.42,43.9C96.11,49.23 96.37,54.45 96.24,59.44C96.16,62.4 94.06,64.88 91.18,65.54C83.34,67.36 75.15,68.84 66.7,69.93C58.26,71.02 49.97,71.67 41.93,71.9C38.98,71.98 36.31,70.12 35.49,67.28C34.1,62.48 33.02,57.37 32.33,52.04C31.65,46.7 31.39,41.47 31.52,36.48C31.59,33.52 33.7,31.04 36.58,30.38C44.41,28.56 52.59,27.08 61.04,25.99Z"
android:fillColor="#F05F2B"/>
<path
android:pathData="M57.12,43.71C56.95,42.41 58.22,41.41 59.44,41.87L69.51,45.71C70.8,46.2 71.02,47.92 69.9,48.72L61.13,54.99C60.07,55.74 58.58,55.1 58.42,53.8L57.12,43.71Z"
android:fillColor="#671907"/>
<path
android:pathData="M50.45,23.44C50.53,23.44 50.61,23.46 50.67,23.51C50.73,23.56 50.78,23.62 50.79,23.7C50.8,23.78 50.78,23.85 50.74,23.92C50.7,23.99 50.63,24.03 50.55,24.06C50.31,24.13 50.07,24.2 49.83,24.27C47.65,24.91 45.46,25.45 43.26,25.89C41.05,26.34 38.83,26.73 36.6,27.07C36.35,27.1 36.1,27.14 35.85,27.18C35.74,27.19 35.63,27.17 35.53,27.11C35.44,27.05 35.37,26.95 35.34,26.85C35.32,26.74 35.34,26.62 35.39,26.53C35.45,26.43 35.54,26.36 35.65,26.32C35.89,26.24 36.13,26.17 36.37,26.09C38.53,25.4 40.73,24.83 42.95,24.38C45.17,23.93 47.42,23.63 49.69,23.49C49.94,23.47 50.2,23.46 50.45,23.44Z"
android:fillColor="#CC3B0A"/>
<path
android:pathData="M49.77,60.68C49.84,60.69 49.9,60.72 49.94,60.76C49.98,60.81 49.99,60.87 49.97,60.93C49.95,60.99 49.9,61.05 49.84,61.1C49.67,61.22 49.51,61.35 49.34,61.48C47.83,62.62 46.26,63.67 44.62,64.64C42.98,65.61 41.27,66.5 39.5,67.3C39.3,67.39 39.1,67.47 38.9,67.56C38.83,67.59 38.75,67.61 38.67,67.6C38.6,67.6 38.54,67.57 38.5,67.52C38.46,67.48 38.45,67.42 38.47,67.36C38.49,67.29 38.54,67.23 38.6,67.19C38.76,67.06 38.93,66.93 39.1,66.81C40.6,65.67 42.18,64.61 43.82,63.64C45.46,62.67 47.17,61.79 48.94,60.99C49.14,60.9 49.34,60.81 49.54,60.72C49.61,60.69 49.69,60.67 49.77,60.68Z"
android:fillColor="#9E2B08"/>
<path
android:pathData="M46.75,56.83C46.83,56.83 46.89,56.86 46.93,56.91C46.96,56.96 46.97,57.02 46.95,57.08C46.92,57.15 46.87,57.21 46.81,57.25C46.69,57.33 46.57,57.41 46.46,57.49C45.4,58.19 44.32,58.85 43.21,59.48C42.09,60.11 40.95,60.7 39.78,61.26C39.65,61.32 39.52,61.38 39.39,61.44C39.32,61.47 39.24,61.49 39.16,61.48C39.09,61.48 39.02,61.45 38.99,61.4C38.95,61.35 38.94,61.29 38.97,61.22C38.99,61.16 39.04,61.1 39.11,61.06C39.22,60.98 39.34,60.9 39.46,60.82C40.51,60.12 41.6,59.45 42.71,58.83C43.82,58.2 44.96,57.61 46.13,57.05C46.26,56.99 46.39,56.93 46.52,56.87C46.59,56.83 46.68,56.82 46.75,56.83Z"
android:fillColor="#9E2B08"/>
<path
android:pathData="M44.28,52.75C44.36,52.76 44.42,52.79 44.46,52.83C44.49,52.87 44.51,52.93 44.49,52.99C44.47,53.05 44.43,53.11 44.38,53.16C44.33,53.2 44.28,53.25 44.23,53.29C43.78,53.68 43.29,54.04 42.78,54.36C42.26,54.68 41.71,54.97 41.13,55.22C41.07,55.25 41,55.27 40.94,55.3C40.87,55.33 40.79,55.35 40.71,55.34C40.64,55.34 40.58,55.31 40.54,55.27C40.5,55.22 40.49,55.17 40.51,55.11C40.52,55.04 40.57,54.99 40.62,54.94C40.67,54.89 40.72,54.85 40.77,54.8C41.22,54.41 41.71,54.05 42.22,53.73C42.74,53.41 43.28,53.13 43.86,52.88C43.93,52.85 43.99,52.82 44.06,52.8C44.13,52.77 44.21,52.75 44.28,52.75Z"
android:fillColor="#9E2B08"/>
<path
android:pathData="M85.8,23.28C89.08,23.18 92.06,25.25 92.99,28.43C94.39,33.27 95.47,38.43 96.17,43.8C96.86,49.17 97.12,54.43 96.99,59.46C96.9,62.77 94.55,65.53 91.35,66.28C83.48,68.1 75.27,69.58 66.8,70.68C58.33,71.77 50.02,72.42 41.95,72.65C38.67,72.74 35.69,70.67 34.77,67.49C33.36,62.65 32.28,57.51 31.59,52.13C30.9,46.75 30.64,41.49 30.77,36.46C30.85,33.15 33.21,30.39 36.41,29.65C44.27,27.82 52.47,26.34 60.94,25.25C69.41,24.16 77.73,23.51 85.8,23.28ZM85.84,24.78C77.83,25.01 69.56,25.65 61.13,26.74C52.71,27.82 44.56,29.3 36.75,31.11C34.19,31.7 32.33,33.9 32.27,36.5C32.14,41.45 32.39,46.64 33.08,51.94C33.76,57.24 34.83,62.31 36.21,67.07C36.93,69.57 39.28,71.22 41.91,71.15C49.92,70.92 58.19,70.27 66.61,69.19C75.03,68.1 83.19,66.63 91.01,64.81C93.57,64.22 95.42,62.02 95.49,59.42C95.62,54.47 95.36,49.29 94.68,43.99C94,38.69 92.93,33.62 91.55,28.85C90.82,26.36 88.47,24.7 85.84,24.78Z"
android:fillColor="#9E2B08"
android:fillType="evenOdd"/>
<path
android:pathData="M40.74,41.99C41.09,42 41.42,42.13 41.65,42.36C42.07,42.77 42.48,43.17 42.89,43.57L62.89,63.12C66.26,62.68 69.42,64.95 70.05,68.33C70.71,71.83 68.4,75.2 64.9,75.86C61.4,76.51 58.03,74.21 57.38,70.71C57.18,69.65 57.25,68.6 57.55,67.64C51.93,60.26 46.31,52.89 40.69,45.51C40.34,45.05 40,44.6 39.65,44.14C39.45,43.88 39.36,43.53 39.39,43.19C39.43,42.85 39.58,42.54 39.83,42.32C40.07,42.1 40.4,41.99 40.74,41.99Z"
android:fillColor="#290E0A"/>
</vector>
Comment thread
mikescamell marked this conversation as resolved.
33 changes: 33 additions & 0 deletions app/src/internal/res/drawable/apptp_shield_disabled.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="128dp"
android:height="96dp"
android:viewportWidth="128"
android:viewportHeight="96">
<path
android:pathData="M55.72,17.9c1.18,-2.95 4.21,-4.72 7.36,-4.32l23.31,2.97c4.87,0.62 7.84,5.67 6.01,10.23L73.53,73.95c-1.57,3.93 -5.61,6.31 -9.81,5.77L41.45,76.89c-4.53,-0.58 -7.29,-5.28 -5.59,-9.52l5.01,-12.47c-1.95,-1.36 -3.81,-3.17 -5.21,-5.45 -3.05,-4.98 -3.49,-10.31 -3.21,-14.05 0.19,-2.54 0.82,-4.06 1.93,-5.09 1.09,-1.01 2.58,-1.51 4.35,-2.08 2.74,-0.89 4.8,-2.11 6.08,-3.36 1.52,-1.49 3.31,-2.07 5.06,-2.07 1.19,0 2.4,0.27 3.53,0.91z"
android:fillColor="#AAA"/>
<path
android:pathData="M55.59,18.34c1.28,-3.13 4.49,-5.02 7.84,-4.61l19.58,2.37c3.8,0.46 6.13,4.39 4.72,7.94L69.52,70.01c-1.18,2.97 -4.21,4.76 -7.38,4.37l-20.44,-2.57c-3.81,-0.48 -6.12,-4.44 -4.67,-7.99l3.69,-9.03c0.7,0.5 1.42,0.94 2.13,1.33 2.63,1.43 5.25,2.12 7.03,2.12s4.39,-0.69 7.03,-2.12c2.64,-1.43 5.31,-3.63 7.18,-6.67 3.05,-4.98 3.49,-10.31 3.21,-14.05 -0.19,-2.54 -0.82,-4.06 -1.93,-5.1 -1.09,-1.01 -2.58,-1.51 -4.35,-2.08 -2.75,-0.89 -4.8,-2.11 -6.08,-3.37 -0.48,-0.47 -0.99,-0.85 -1.52,-1.15zM55.91,59.03c-1.09,-0.14 -2.39,0.71 -2.9,1.89l-1.23,2.86c-0.51,1.18 -0.04,2.26 1.05,2.4l2.64,0.34c1.09,0.14 2.39,-0.71 2.9,-1.89l1.23,-2.86c0.51,-1.18 0.04,-2.26 -1.05,-2.39z"
android:fillColor="#FAFAFA"
android:fillType="evenOdd"/>
<path
android:pathData="M65.15,52.63c0.54,-1.26 1.92,-2.16 3.09,-2.01l2.81,0.36c1.16,0.15 1.66,1.29 1.12,2.55l-1.31,3.04c-0.54,1.26 -1.93,2.16 -3.09,2.02l-2.81,-0.36c-1.16,-0.15 -1.66,-1.29 -1.12,-2.55z"
android:fillColor="#888"/>
<path
android:pathData="m44.55,66.95 l15.02,1.9c0.32,0.04 0.51,0.39 0.36,0.68 -0.17,0.33 -0.52,0.52 -0.89,0.47l-15.03,-1.88c-0.3,-0.04 -0.48,-0.34 -0.38,-0.62 0.14,-0.37 0.52,-0.6 0.92,-0.55M61.4,61.72c0.54,-1.26 1.92,-2.16 3.09,-2.01l2.81,0.36c1.16,0.15 1.66,1.29 1.12,2.55l-1.31,3.04c-0.54,1.26 -1.93,2.16 -3.09,2.01l-2.81,-0.36c-1.16,-0.15 -1.66,-1.29 -1.12,-2.55zM69.01,43.2c0.54,-1.26 1.92,-2.16 3.09,-2.01l2.81,0.36c1.16,0.15 1.66,1.29 1.12,2.55l-1.31,3.04c-0.54,1.26 -1.93,2.16 -3.09,2.01l-2.81,-0.36c-1.16,-0.15 -1.66,-1.29 -1.12,-2.55z"
android:fillColor="#EEE"/>
<path
android:pathData="M90.42,36.56c4.05,0.64 6.2,5.15 4.14,8.7l-15.35,26.37c-1.25,2.15 -3.56,3.48 -6.05,3.48h-0.13q0.28,-0.5 0.5,-1.05L88.64,36.28zM50.83,23.98c0.49,-0.56 1.25,-0.8 2.07,-0.42 0.74,0.34 1.42,0.81 2.01,1.4 1.28,1.25 3.33,2.48 6.08,3.36 1.77,0.57 3.27,1.07 4.35,2.08 1.1,1.03 1.74,2.56 1.93,5.1l0.02,0.35c0.22,3.72 -0.28,8.87 -3.24,13.7 -2.73,4.45 -7.2,7.09 -10.76,8.18 -0.98,0.3 -2.03,0.19 -2.8,-0.26 -0.79,-0.46 -1.28,-1.29 -1.08,-2.36 1.16,-6.19 2.17,-13.36 1.72,-20.15 -0.32,-4.78 -0.43,-6.76 -0.84,-8.79 -0.17,-0.82 0.05,-1.65 0.53,-2.19m7.64,-0.76c0.5,-1.41 1.98,-2.18 3.4,-1.98l18.44,2.42c1.43,0.19 2.26,1.5 1.86,2.91 -0.4,1.41 -1.88,2.4 -3.3,2.21l-18.64,-2.64c-1.43,-0.19 -2.26,-1.5 -1.76,-2.91"
android:fillColor="#CCC"/>
<path
android:pathData="M54.85,33.8c0.52,-0.52 1.37,-0.52 1.89,0s0.52,1.37 0,1.89L51.8,40.61l4.93,4.93c0.52,0.52 0.52,1.37 0,1.89s-1.37,0.52 -1.89,0l-4.93,-4.93 -4.93,4.93c-0.52,0.52 -1.37,0.52 -1.89,0s-0.52,-1.37 0,-1.88l4.93,-4.93 -4.93,-4.93c-0.52,-0.52 -0.52,-1.37 0,-1.89s1.37,-0.52 1.89,0l4.93,4.93z"
android:fillColor="#484848"
android:fillType="evenOdd"/>
<path
android:pathData="M78.82,46.12c0.07,-0.03 0.14,-0.03 0.21,-0 0.07,0.03 0.12,0.08 0.15,0.15 0.03,0.07 0.03,0.14 0.01,0.21q-0.37,1.08 -0.75,2.15 -3.2,9.15 -6.75,18.17c-0.43,1.1 -0.88,2.19 -1.34,3.29 -1.08,2.65 -3.74,4.48 -6.5,4.65 -0.52,0.04 -1.04,0.02 -1.55,-0.05q-0.85,-0.12 -1.71,-0.23 -3.49,-0.49 -6.98,-0.96l-2.25,-0.31c-0.07,-0.01 -0.14,-0.05 -0.18,-0.11 -0.05,-0.06 -0.07,-0.13 -0.06,-0.2 0.01,-0.07 0.05,-0.14 0.1,-0.19s0.13,-0.07 0.2,-0.06l2.26,0.23q3.51,0.36 7.01,0.72l1.71,0.17q0.68,0.07 1.35,-0.01c2.4,-0.25 4.5,-1.98 5.28,-4.17 0.41,-1.11 0.83,-2.22 1.26,-3.32q3.55,-9.02 7.45,-17.89 0.46,-1.04 0.92,-2.08c0.03,-0.07 0.08,-0.12 0.15,-0.15M48.69,72.25q0.24,-0.01 0.47,0.01t0.47,0.07l0.05,0.01c0.07,0.02 0.13,0.05 0.17,0.11 0.05,0.05 0.07,0.12 0.06,0.19 -0,0.07 -0.04,0.13 -0.09,0.18 -0.05,0.05 -0.12,0.07 -0.19,0.08l-0.05,0q-0.24,0.01 -0.47,-0.01t-0.47,-0.07l-0.05,-0.01c-0.07,-0.02 -0.13,-0.05 -0.17,-0.11 -0.04,-0.05 -0.07,-0.12 -0.06,-0.19s0.04,-0.13 0.09,-0.18c0.05,-0.05 0.12,-0.07 0.19,-0.08q0.03,0 0.05,-0m18.61,-37.07c0.06,-0 0.13,0.02 0.18,0.06 0.05,0.04 0.08,0.1 0.09,0.16 0.07,0.65 0.11,1.31 0.13,1.97 0.11,4.08 -0.72,8.3 -2.78,11.95q-0.17,0.3 -0.35,0.59c-1.87,3.11 -4.7,5.57 -7.89,7.21 -2.09,1.05 -4.34,1.84 -6.79,1.83 -1.84,-0.08 -3.54,-0.6 -5.14,-1.31q-0.91,-0.41 -1.76,-0.92c-0.07,-0.04 -0.12,-0.1 -0.14,-0.18s-0.02,-0.16 0.02,-0.23c0.04,-0.07 0.1,-0.12 0.17,-0.15 0.08,-0.03 0.16,-0.02 0.23,0.01q0.88,0.38 1.79,0.67c1.59,0.5 3.26,0.83 4.84,0.79 2.06,-0.12 4.17,-0.91 6.09,-1.88 2.96,-1.52 5.58,-3.8 7.31,-6.63q0.17,-0.28 0.33,-0.55c1.94,-3.38 3.19,-7.23 3.42,-11.22 0.04,-0.64 0.05,-1.28 0.02,-1.92 -0,-0.06 0.02,-0.13 0.06,-0.18s0.1,-0.08 0.17,-0.08m1.95,-17.62 l0.38,0.04 6.75,0.76 0.38,0.04c0.18,0.02 0.35,0.11 0.46,0.26 0.11,0.15 0.16,0.34 0.13,0.53 -0.03,0.19 -0.12,0.36 -0.27,0.47s-0.33,0.16 -0.52,0.12l-0.37,-0.06 -6.7,-1.13 -0.37,-0.06c-0.12,-0.02 -0.24,-0.09 -0.31,-0.19 -0.08,-0.1 -0.11,-0.23 -0.09,-0.35 0.02,-0.13 0.08,-0.24 0.18,-0.32 0.1,-0.08 0.23,-0.12 0.35,-0.1"
android:fillColor="#686868"/>
<path
android:pathData="M55.02,17.73c1.31,-3.26 4.66,-5.23 8.15,-4.78l23.31,2.97c5.35,0.68 8.62,6.24 6.62,11.25L74.22,74.34c-1.7,4.25 -6.06,6.82 -10.6,6.24L41.35,77.74c-5.02,-0.64 -8.08,-5.85 -6.19,-10.54l4.71,-11.72c-0.72,-0.64 -1.38,-1.32 -2.01,-2.01 -0.98,-1.09 -1.91,-2.21 -2.71,-3.51 -1.49,-2.45 -2.46,-5.21 -2.92,-8.02 -0.36,-2.16 -0.44,-4.37 -0.28,-6.54 0.14,-1.73 0.44,-3.68 1.8,-5.18 1.39,-1.47 3.22,-1.93 4.81,-2.48 2.2,-0.73 4.36,-1.77 5.96,-3.32 1.34,-1.37 3.28,-2.21 5.21,-2.23h0.37c0.99,0.01 1.99,0.24 2.9,0.64zM62.98,14.43c-2.81,-0.36 -5.51,1.23 -6.56,3.86l-2.12,5.27q0.43,0.3 0.81,0.66 0.1,0.09 0.19,0.18c1.59,1.53 3.81,2.55 6.02,3.35 1.5,0.56 3.16,1.08 4.43,2.34 0.86,0.86 1.33,2 1.53,3.11 0.01,0.07 0,0.14 -0.04,0.2 -0.04,0.06 -0.1,0.1 -0.17,0.12s-0.14,0.01 -0.2,-0.03c-0.06,-0.04 -0.11,-0.1 -0.13,-0.16 -0.31,-1.02 -0.83,-1.95 -1.61,-2.58 -1.13,-0.94 -2.68,-1.33 -4.21,-1.79 -2.36,-0.72 -4.74,-1.67 -6.67,-3.5q-0.08,-0.08 -0.16,-0.15c-1.14,-1.07 -2.63,-1.66 -4.19,-1.65 -1.63,-0.01 -3.19,0.64 -4.35,1.8 -1.88,1.81 -4.19,2.89 -6.54,3.66 -1.6,0.53 -3.22,1.02 -4.18,2.07 -0.98,1.04 -1.3,2.67 -1.42,4.29 -0.15,2.07 -0.08,4.16 0.27,6.19 0.44,2.65 1.35,5.22 2.74,7.5 0.71,1.14 1.62,2.24 2.56,3.27 0.72,0.79 1.49,1.56 2.29,2.21 0.16,0.13 0.25,0.31 0.27,0.5 0.01,0.14 -0.01,0.28 -0.08,0.41l-4.89,12.17c-1.52,3.78 0.95,7.98 4.99,8.5l22.27,2.84c3.87,0.49 7.57,-1.69 9.02,-5.31l18.87,-47.18c1.64,-4.1 -1.03,-8.64 -5.41,-9.2z"
android:fillColor="#686868"
android:fillType="evenOdd"/>
</vector>
Loading
Loading