For issue #19290 update to proton icons second batch

upstream-sync
Arturo Mejia 3 years ago
parent 516d52997d
commit 9bfb31519a

@ -547,7 +547,7 @@ open class DefaultToolbarMenu(
val syncMenuItem = BrowserMenuImageText(
getSyncItemTitle(),
R.drawable.ic_synced_tabs,
R.drawable.ic_signed_out,
primaryTextColor()
) {
onItemTapped.invoke(ToolbarMenu.Item.SyncAccount(accountManager.signedInToFxa()))

@ -18,7 +18,7 @@ class OnboardingPrivacyNoticeViewHolder(
) : RecyclerView.ViewHolder(view) {
init {
view.header_text.setOnboardingIcon(R.drawable.ic_onboarding_privacy_notice)
view.header_text.setOnboardingIcon(R.drawable.ic_info)
val appName = view.context.getString(R.string.app_name)
view.description_text.text = view.context.getString(R.string.onboarding_privacy_notice_description2, appName)

@ -9,6 +9,6 @@
android:viewportHeight="24">
<path
android:fillColor="?primaryText"
android:pathData="M6.749,21.248C6.4234,21.2471 6.1142,21.1054 5.9008,20.8595C5.6875,20.6136 5.5909,20.2874 5.636,19.965L6.414,14.4L2.674,10.38C2.3928,10.0785 2.2991,9.6474 2.4296,9.2564C2.5601,8.8654 2.8941,8.5771 3.3,8.505L8.529,7.57L10.993,2.624C11.1833,2.242 11.5733,2.0006 12,2.0006C12.4267,2.0006 12.8167,2.242 13.007,2.624L15.471,7.57L20.7,8.5C21.1057,8.5724 21.4394,8.8608 21.5697,9.2518C21.7,9.6427 21.6062,10.0737 21.325,10.375L17.586,14.4L18.364,19.968C18.4229,20.3853 18.2434,20.8005 17.8991,21.0434C17.5547,21.2864 17.1034,21.3164 16.73,21.121L12,18.654L7.269,21.119C7.1087,21.2035 6.9302,21.2478 6.749,21.248Z"
android:pathData="M6.505 14.215L3.033 11.33a1.465 1.465 0 0 1-0.46-1.59c0.187-0.576 0.7-0.974 1.305-1.013l4.489-0.29 0.609-0.455 1.656-4.161A1.467 1.467 0 0 1 12 2.892c0.606 0 1.143 0.366 1.368 0.927l1.656 4.162 0.608 0.455 4.489 0.29a1.464 1.464 0 0 1 1.305 1.014 1.465 1.465 0 0 1-0.46 1.589L17.5 14.208l-0.218 0.719 1.105 4.34a1.462 1.462 0 0 1-0.562 1.555 1.472 1.472 0 0 1-1.652 0.055l-3.797-2.4h-0.755l-3.796 2.4a1.473 1.473 0 0 1-1.653-0.055 1.462 1.462 0 0 1-0.562-1.554l1.103-4.33-0.208-0.723z"
android:strokeWidth="1" />
</vector>

@ -3,10 +3,10 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="10dp"
android:height="6dp"
android:viewportWidth="10"
android:viewportHeight="6">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path android:fillColor="?primaryText"
android:pathData="M5 5.67a0.67 0.67 0 0 1-0.47-0.2l-4-4a0.67 0.67 0 0 1 0.94-0.94L5 4.06 8.53 0.53a0.67 0.67 0 0 1 0.94 0.94l-4 4c-0.12 0.13-0.3 0.2-0.47 0.2z"/>
android:pathData="M12 14.289L5.28 7.57a0.75 0.75 0 1 0-1.061 1.061l7.37 7.37h0.821l7.37-7.37a0.748 0.748 0 0 0 0-1.061 0.75 0.75 0 0 0-1.061 0L12 14.289z"/>
</vector>

@ -3,10 +3,10 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="10dp"
android:height="6dp"
android:viewportWidth="10"
android:viewportHeight="6">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path android:fillColor="?primaryText"
android:pathData="M5 0.33a0.67 0.67 0 0 0-0.47 0.2l-4 4a0.67 0.67 0 0 0 0.94 0.94L5 1.94l3.53 3.53a0.67 0.67 0 0 0 0.94-0.94l-4-4A0.67 0.67 0 0 0 5 0.33z"/>
android:pathData="m12,8.711 l-6.72,6.72a0.75,0.75 0,1 1,-1.061 -1.061L11.589,7h0.821l7.37,7.37c0.147,0.146 0.22,0.338 0.22,0.53a0.75,0.75 0,0 1,-1.281 0.53L12,8.711z"/>
</vector>

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M10.404,18.394a6.47,6.47 0,0 1,-4.429 -3.056,2.451 2.451,0 0,1 1.839,-0.838h2.936a6.483,6.483 0,0 1,1.379 -2.068A3,3 0,1 1,14.5 9.5c0,0.591 -0.177,1.139 -0.472,1.603a6.47,6.47 0,0 1,6.945 0.962,9.725 9.725,0 0,0 -0.107,-2.176c-0.65,-3.933 -3.822,-7.105 -7.755,-7.755C6.62,1.06 1.06,6.62 2.133,13.111c0.65,3.933 3.822,7.105 7.755,7.755a9.81,9.81 0,0 0,1.731 0.115,6.465 6.465,0 0,1 -1.215,-2.587z"
android:fillColor="?primaryText"/>
<path
android:pathData="M16.75,12a5,5 0,1 0,0.001 10.001A5,5 0,0 0,16.75 12zM16.75,20a0.75,0.75 0,1 1,0 -1.5,0.75 0.75,0 0,1 0,1.5zM17.5,16.9a0.75,0.75 0,0 1,-1.5 0v-2.15a0.75,0.75 0,0 1,1.5 0v2.15z"
android:fillColor="?primaryText"/>
</vector>

@ -8,9 +8,12 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?accent"
android:pathData="M17.6655,14.2092C16.1843,12.4998 14.1333,14.8 11.9997,14.8C9.8675,14.8 7.8151,12.4998 6.3339,14.2092C5.9139,14.6936 5.8803,15.3992 6.2401,15.9284C7.4959,17.7764 9.5959,19 11.9997,19C14.4035,19 16.5035,17.7764 17.7593,15.9284C18.1205,15.3992 18.0855,14.6936 17.6655,14.2092M16.25,9.25C16.25,6.9026 14.3474,5 12,5C9.6526,5 7.75,6.9026 7.75,9.25C7.75,11.5974 9.6526,13.5 12,13.5C14.3474,13.5 16.25,11.5974 16.25,9.25Z" />
android:fillColor="?onboardingSelected"
android:pathData="M12 6.5a3 3 0 1 0 0 6 3 3 0 0 0 0-6z" />
<path
android:fillColor="?accent"
android:pathData="M12,22C6.4772,22 2,17.5228 2,12C2,6.4772 6.4772,2 12,2C17.5228,2 22,6.4772 22,12C21.9939,17.5203 17.5203,21.9939 12,22L12,22ZM12,4C7.5817,4 4,7.5817 4,12C4,16.4183 7.5817,20 12,20C16.4183,20 20,16.4183 20,12C19.995,7.5838 16.4162,4.005 12,4Z" />
android:fillColor="?onboardingSelected"
android:pathData="M12 21.5c-5.238 0-9.5-4.262-9.5-9.5S6.762 2.5 12 2.5s9.5 4.262 9.5 9.5-4.262 9.5-9.5 9.5zM12 4c-4.411 0-8 3.589-8 8s3.589 8 8 8 8-3.589 8-8-3.589-8-8-8z" />
<path
android:fillColor="?onboardingSelected"
android:pathData="M8.314 14c-0.652 0-1.232 0.269-1.672 0.684A6.014 6.014 0 0 0 12 18a6.355 6.355 0 0 0 1.084-0.104c0.083-0.014 0.165-0.033 0.247-0.051a6.014 6.014 0 0 0 4.027-3.162A2.43 2.43 0 0 0 15.686 14H8.314z" />
</vector>

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path android:pathData="M12 22a10 10 0 1 1 0-20 10 10 0 0 1 0 20zm0-18a8 8 0 1 0 0 16 8 8 0 0 0 0-16zm0 7c0.6 0 1 0.4 1 1v4a1 1 0 0 1-2 0v-4c0-0.6 0.4-1 1-1zm0-4a1 1 0 1 1 0 2 1 1 0 0 1 0-2z">
<aapt:attr name="android:fillColor">
<gradient
android:startY="3.2727787"
android:startX="22.576483"
android:endY="15.679591"
android:endX="6.9187684"
android:type="linear">
<item android:offset="0" android:color="#6A11CB"/>
<item android:offset="1" android:color="#2575FC"/>
</gradient>
</aapt:attr>
</path>
</vector>

@ -8,6 +8,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M11.586,11l-1.293,-1.293a1,1 0,0 1,1.414 -1.414l3,3a1,1 0,0 1,0 1.414l-3,3a1,1 0,0 1,-1.414 -1.414L11.586,13H3a1,1 0,0 1,0 -2h8.586zM7,8a1,1 0,1 1,-2 0V6a4,4 0,0 1,4 -4h8a4,4 0,0 1,4 4v12a4,4 0,0 1,-4 4H9a4,4 0,0 1,-4 -4v-2a1,1 0,0 1,2 0v2a2,2 0,0 0,2 2h8a2,2 0,0 0,2 -2V6a2,2 0,0 0,-2 -2H9a2,2 0,0 0,-2 2v2z"
android:pathData="M12 2.5c-5.238 0-9.5 4.262-9.5 9.5s4.262 9.5 9.5 9.5 9.5-4.262 9.5-9.5-4.262-9.5-9.5-9.5zM12 7a3 3 0 1 1 0 6 3 3 0 0 1 0-6zm0 12c-2.353 0-4.395-1.277-5.525-3.162A2.451 2.451 0 0 1 8.314 15h7.373c0.734 0 1.386 0.328 1.839 0.838C16.395 17.723 14.353 19 12 19z"
android:fillColor="?primaryText" />
</vector>

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?primaryText"
android:pathData="M12 6.5a3 3 0 1 0 0 6 3 3 0 0 0 0-6z" />
<path
android:fillColor="?primaryText"
android:pathData="M12 21.5c-5.238 0-9.5-4.262-9.5-9.5S6.762 2.5 12 2.5s9.5 4.262 9.5 9.5-4.262 9.5-9.5 9.5zM12 4c-4.411 0-8 3.589-8 8s3.589 8 8 8 8-3.589 8-8-3.589-8-8-8z" />
<path
android:fillColor="?primaryText"
android:pathData="M8.314 14c-0.652 0-1.232 0.269-1.672 0.684A6.014 6.014 0 0 0 12 18a6.355 6.355 0 0 0 1.084-0.104c0.083-0.014 0.165-0.033 0.247-0.051a6.014 6.014 0 0 0 4.027-3.162A2.43 2.43 0 0 0 15.686 14H8.314z" />
</vector>

@ -3,13 +3,14 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="23dp"
android:height="21dp"
android:viewportWidth="23"
android:viewportHeight="21">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M16 9c0.6 0 1.16 0.32 1.47 0.83l0.07 0.13 4.32 8.55A1.72 1.72 0 0 1 20.38 21H11.68a1.73 1.73 0 0 1-1.57-2.33l0.07-0.16 4.27-8.55c0.3-0.59 0.9-0.96 1.55-0.96zm-6-9a10 10 0 0 1 9.77 12.14l-1.33-2.63a2.72 2.72 0 0 0-4.6-0.46 4.25 4.25 0 1 0-0.4 0.68l-1.23 2.49a5.9 5.9 0 0 1-2.21 0.58c-2.13 0-4.18-2.3-5.67-0.6a1.41 1.41 0 0 0-0.1 1.73c1.22 1.8 3.25 3 5.58 3.07l-0.54 1.06c-0.3 0.6-0.35 1.27-0.2 1.9A10 10 0 0 1 10 0zm5.32 17.3a1.02 1.02 0 1 0 1.45 1.43 1.02 1.02 0 0 0-1.45-1.44zm0.26-5.31a0.87 0.87 0 0 0-0.4 0.85v2.6a0.87 0.87 0 0 0 1.73 0v-2.6a0.87 0.87 0 0 0-1.33-0.85z"
android:strokeWidth="1"
android:fillColor="#20123A"
android:fillType="nonZero"/>
android:fillColor="?primaryText"
android:pathData="M10.07 20.336l1.198-2.089A6.364 6.364 0 0 1 9.5 18.5c-2.353 0-4.395-1.277-5.525-3.162a2.451 2.451 0 0 1 1.84-0.838h7.372c0.075 0 0.144 0.017 0.217 0.024l1.28-2.231c0.916-1.596 3.218-1.596 4.134 0l0.12 0.208a9.71 9.71 0 0 0-0.07-2.613c-0.65-3.933-3.823-7.105-7.756-7.755C4.62 1.06-0.94 6.62 0.133 13.111c0.65 3.933 3.822 7.105 7.755 7.755a9.794 9.794 0 0 0 1.93 0.111c0.052-0.217 0.132-0.432 0.251-0.641zM9.5 6.5a3 3 0 1 1 0 6 3 3 0 0 1 0-6z" />
<path
android:fillColor="?primaryText"
android:pathData="M21.58 20.073l-3.68-6.414c-0.504-0.879-1.795-0.879-2.299 0l-3.679 6.414C11.427 20.935 12.062 22 13.072 22h7.358c1.008 0 1.643-1.065 1.15-1.927zM16.75 21a0.75 0.75 0 1 1 0-1.5 0.75 0.75 0 0 1 0 1.5zM16 15.725a0.75 0.75 0 0 1 1.5 0V17.9a0.75 0.75 0 0 1-1.5 0v-2.175z" />
</vector>

@ -9,5 +9,5 @@
android:viewportHeight="24">
<path
android:fillColor="?primaryText"
android:pathData="m9.667,13c0.7362,0 1.333,0.5968 1.333,1.333v5.334c0,0.7362 -0.5968,1.333 -1.333,1.333h-5.334c-0.7362,0 -1.333,-0.5968 -1.333,-1.333v-5.334c0,-0.7362 0.5968,-1.333 1.333,-1.333zM19.667,13c0.7362,0 1.333,0.5968 1.333,1.333v5.334c0,0.7362 -0.5968,1.333 -1.333,1.333h-5.334c-0.7362,0 -1.333,-0.5968 -1.333,-1.333v-5.334c0,-0.7362 0.5968,-1.333 1.333,-1.333zM9.667,3c0.7362,0 1.333,0.5968 1.333,1.333v5.334c0,0.7362 -0.5968,1.333 -1.333,1.333h-5.334c-0.7362,0 -1.333,-0.5968 -1.333,-1.333v-5.334c0,-0.7362 0.5968,-1.333 1.333,-1.333zM19.667,3c0.7362,0 1.333,0.5968 1.333,1.333v5.334c0,0.7362 -0.5968,1.333 -1.333,1.333h-5.334c-0.7362,0 -1.333,-0.5968 -1.333,-1.333v-5.334c0,-0.7362 0.5968,-1.333 1.333,-1.333z" />
android:pathData="M21.28 20.22l-5.472-5.472 2.986-2.986c0.527-0.528 0.68-1.285 0.398-1.976a1.796 1.796 0 0 0-1.665-1.133l-2.475-0.029-3.775-3.776 1.068-1.068a0.75 0.75 0 1 0-1.061-1.061L2.72 11.287a0.75 0.75 0 0 0 1.06 1.061l1.079-1.079 3.775 3.775 0.029 2.475a1.794 1.794 0 0 0 1.135 1.665 1.795 1.795 0 0 0 1.973-0.398l2.977-2.977 5.472 5.472a0.748 0.748 0 0 0 1.06 0 0.75 0.75 0 0 0 0-1.061zm-10.569-2.495a0.304 0.304 0 0 1-0.348 0.07 0.307 0.307 0 0 1-0.2-0.294l-0.037-3.086-4.207-4.207 4.299-4.299 4.206 4.207 3.086 0.037a0.306 0.306 0 0 1 0.294 0.199 0.31 0.31 0 0 1-0.07 0.349l-7.023 7.024z" />
</vector>

@ -48,8 +48,8 @@
tools:text="@tools:sample/lorem/random" />
<ImageView
android:id="@+id/chevron"
android:layout_width="10dp"
android:layout_height="6dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginEnd="16dp"
android:background="@drawable/ic_chevron"
android:contentDescription="@string/tab_menu"

@ -191,8 +191,8 @@
<dimen name="tab_tray_new_collection_drawable_padding">28dp</dimen>
<!-- Saved Logins Fragment -->
<dimen name="saved_logins_sort_menu_dropdown_chevron_icon_margin_start">10dp</dimen>
<dimen name="saved_logins_sort_menu_dropdown_chevron_icon_size">12dp</dimen>
<dimen name="saved_logins_sort_menu_dropdown_chevron_icon_margin_start">24dp</dimen>
<dimen name="saved_logins_sort_menu_dropdown_chevron_icon_size">24dp</dimen>
<dimen name="saved_logins_detail_menu_vertical_padding">5dp</dimen>
<dimen name="saved_logins_end_icon_drawable_padding">16dp</dimen>
<dimen name="saved_logins_item_padding">4dp</dimen>

Loading…
Cancel
Save