Skip to content

GitLab

T
tangled
Commit 71a1bf0a authored by sandromaggi's avatar sandromaggi Committed by Commit Bot
Browse files
Options

[Autofill Assistant] Add missing icons. 

We got a list of icons from UX per vertical, those are now added to
the client for easy use through local resources.

Bug: b/161337790
Change-Id: I118b4d2c2c9cb229165cfeccb058718f8580eece
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2299624
Commit-Queue: Sandro Maggi <sandromaggi@google.com>
Reviewed-by: default avatarMarian Fechete <marianfe@google.com>
Reviewed-by: default avatarClemens Arbesser <arbesser@google.com>
Cr-Commit-Position: refs/heads/master@{#788668}
parent d1e4366a
Hide whitespace changes
Inline Side-by-side
Showing with 228 additions and 15 deletions
chrome/android/features/autofill_assistant/BUILD.gn
View file @ 71a1bf0a
......@@ -316,16 +316,25 @@ android_resources("java_resources") {
"java/res/drawable/autofill_assistant_rounded_corner_background.xml",
"java/res/drawable/autofill_assistant_swipe_indicator.xml",
"java/res/drawable/ic_add_outline_white_24dp.xml",
"java/res/drawable/ic_airline_seat_recline_normal_black_24dp.xml",
"java/res/drawable/ic_autofill_assistant_add_circle_24dp.xml",
"java/res/drawable/ic_autofill_assistant_default_progress_start_black_24dp.xml",
"java/res/drawable/ic_check_circle_black_24dp.xml",
"java/res/drawable/ic_clear_black_24dp.xml",
"java/res/drawable/ic_confirmation_number_black_24dp.xml",
"java/res/drawable/ic_directions_car_black_24dp.xml",
"java/res/drawable/ic_done_black_24dp.xml",
"java/res/drawable/ic_fastfood_black_24dp.xml",
"java/res/drawable/ic_grocery_black_24dp.xml",
"java/res/drawable/ic_local_dining_black_24dp.xml",
"java/res/drawable/ic_logo_assistant_24dp.xml",
"java/res/drawable/ic_payment_black_24dp.xml",
"java/res/drawable/ic_refresh_black_24dp.xml",
"java/res/drawable/ic_remove_outline_white_24dp.xml",
"java/res/drawable/ic_settings_black_24dp.xml",
"java/res/drawable/ic_shopping_basket_black_24dp.xml",
"java/res/drawable/ic_shopping_basket_black_24dp.xml",
"java/res/drawable/ic_vpn_key_black_24dp.xml",
"java/res/layout/autofill_assistant_address_full.xml",
"java/res/layout/autofill_assistant_address_summary.xml",
"java/res/layout/autofill_assistant_bottom_sheet_content.xml",
......
chrome/android/features/autofill_assistant/java/res/drawable/ic_airline_seat_recline_normal_black_24dp.xml 0 → 100644
View file @ 71a1bf0a
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2020 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
tools:targetApi="21">
<path
android:fillColor="#000000"
android:pathData="M8 7H6v11c0 1.1.9 2 2 2h7v-2H8V7z"/>
<path
android:fillColor="#000000"
android:pathData="M16 14h-2V9.5C14 8.12 12.88 7 11.5 7S9 8.12 9 9.5V15c0 1.1.9 2 2 2h5v5h2v-6c0-1.1-.9-2-2-2z"/>
<path
android:fillColor="#000000"
android:pathData="M 11.5, 4 m -2, 0 a 2,2 0 1, 0 4,0 a 2,2 0 1,0 -4,0"/>
</vector>
\ No newline at end of file
chrome/android/features/autofill_assistant/java/res/drawable/ic_confirmation_number_black_24dp.xml 0 → 100644
View file @ 71a1bf0a
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2020 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
tools:targetApi="21">
<path
android:fillColor="#000000"
android:pathData="M22 10V6c0-1.11-.9-2-2-2H4c-1.1 0-1.99.89-1.99 2v4c1.1 0 1.99.9 1.99 2s-.89 2-2 2v4c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2v-4c-1.1 0-2-.9-2-2s.9-2 2-2zm-2-1.46c-1.19.69-2 1.99-2 3.46s.81 2.77 2 3.46V18H4v-2.54c1.19-.69 2-1.99 2-3.46 0-1.48-.8-2.77-1.99-3.46L4 6h16v2.54zM13 17h-2v-2h2v2zm0-4h-2v-2h2v2zm0-4h-2V7h2v2z"/>
</vector>
\ No newline at end of file
chrome/android/features/autofill_assistant/java/res/drawable/ic_directions_car_black_24dp.xml 0 → 100644
View file @ 71a1bf0a
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2020 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
tools:targetApi="21">
<path
android:fillColor="#000000"
android:pathData="M18.92 6.01C18.72 5.42 18.16 5 17.5 5h-11c-.66 0-1.21.42-1.42 1.01L3 12v8c0 .55.45 1 1 1h1c.55 0 1-.45 1-1v-1h12v1c0 .55.45 1 1 1h1c.55 0 1-.45 1-1v-8l-2.08-5.99zM6.85 7h10.29l1.08 3.11H5.77L6.85 7zM19 17H5v-5h14v5z"/>
<path
android:fillColor="#000000"
android:pathData="M 7.5, 14.5 m -1.5, 0 a 1.5,1.5 0 1,0 3,0 a 1.5,1.5 0 1,0 -3,0"/>
<path
android:fillColor="#000000"
android:pathData="M 16.5, 14.5 m -1.5, 0 a 1.5,1.5 0 1,0 3,0 a 1.5,1.5 0 1,0 -3,0"/>
</vector>
\ No newline at end of file
chrome/android/features/autofill_assistant/java/res/drawable/ic_fastfood_black_24dp.xml 0 → 100644
View file @ 71a1bf0a
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2020 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
tools:targetApi="21">
<path
android:fillColor="#000000"
android:pathData="M1 21.98c0 .56.45 1.01 1.01 1.01H15c.56 0 1.01-.45 1.01-1.01V21H1v.98zM8.5 8.99C4.75 8.99 1 11 1 15h15c0-4-3.75-6.01-7.5-6.01zM1 17h15v2H1zM18 5V1h-2v4h-5l.23 2h9.56l-1.4 14H18v2h1.72c.84 0 1.53-.65 1.63-1.47L23 5h-5z"/>
</vector>
\ No newline at end of file
chrome/android/features/autofill_assistant/java/res/drawable/ic_grocery_black_24dp.xml 0 → 100644
View file @ 71a1bf0a
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2020 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
tools:targetApi="21">
<path
android:fillColor="#000000"
android:pathData="M20.01,5.01c-1.65,0-3,1.34-3,2.99H23C23,6.35,21.66,5.01,20.01,5.01z"/>
<path
android:fillColor="#000000"
android:pathData="M13.99,4.99C13.99,6.65,15.34,8,17,8V1.99C15.34,1.99,13.99,3.33,13.99,4.99z"/>
<path
android:fillColor="#000000"
android:pathData="M16.99,10.99c2.76,0,5.01,2.25,5.01,5.01S19.75,21,16.99,21s-5.01-2.25-5.01-5.01S14.23,10.99,16.99,10.99 M16.99,8.99 c-3.87,0-7.01,3.14-7.01,7.01c0,3.87,3.14,7.01,7.01,7.01s7.01-3.14,7.01-7.01C23.99,12.12,20.86,8.99,16.99,8.99L16.99,8.99z"/>
<path
android:fillColor="#000000"
android:pathData="M10.02,21H2v-9.79L4.72,5h3.5l2.37,5.37l1.52-1.52l-1.72-3.9C10.72,4.9,11,4.62,11,4.27V1.7C11,1.32,10.68,1,10.3,1H2.7 C2.32,1,2,1.32,2,1.7v2.56c0,0.35,0.23,0.62,0.56,0.68l-2.48,5.64C0.03,10.72,0,10.85,0,10.99V22c0,0.55,0.45,1,1,1h11.02 L10.02,21z"/>
</vector>
\ No newline at end of file
chrome/android/features/autofill_assistant/java/res/drawable/ic_local_dining_black_24dp.xml 0 → 100644
View file @ 71a1bf0a
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2020 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
tools:targetApi="21">
<path
android:fillColor="#000000"
android:pathData="M3.91 3.5c-1.56 1.56-1.56 4.09 0 5.66l4.19 4.18 2.83-2.83L3.91 3.5zm10.97 8.03c1.53.71 3.68.21 5.27-1.38 1.91-1.91 2.28-4.65.81-6.12-1.46-1.46-4.2-1.1-6.12.81-1.59 1.59-2.09 3.74-1.38 5.27L3.7 19.87l1.41 1.41L12 14.41l6.88 6.88 1.41-1.41L13.41 13l1.47-1.47z"/>
</vector>
\ No newline at end of file
chrome/android/features/autofill_assistant/java/res/drawable/ic_settings_black_24dp.xml 0 → 100644
View file @ 71a1bf0a
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2020 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
tools:targetApi="21">
<path
android:fillColor="#000000"
android:pathData="M13.85 22.25h-3.7c-.74 0-1.36-.54-1.45-1.27l-.27-1.89c-.27-.14-.53-.29-.79-.46l-1.8.72c-.7.26-1.47-.03-1.81-.65L2.2 15.53c-.35-.66-.2-1.44.36-1.88l1.53-1.19c-.01-.15-.02-.3-.02-.46 0-.15.01-.31.02-.46l-1.52-1.19c-.59-.45-.74-1.26-.37-1.88l1.85-3.19c.34-.62 1.11-.9 1.79-.63l1.81.73c.26-.17.52-.32.78-.46l.27-1.91c.09-.7.71-1.25 1.44-1.25h3.7c.74 0 1.36.54 1.45 1.27l.27 1.89c.27.14.53.29.79.46l1.8-.72c.71-.26 1.48.03 1.82.65l1.84 3.18c.36.66.2 1.44-.36 1.88l-1.52 1.19c.01.15.02.3.02.46s-.01.31-.02.46l1.52 1.19c.56.45.72 1.23.37 1.86l-1.86 3.22c-.34.62-1.11.9-1.8.63l-1.8-.72c-.26.17-.52.32-.78.46l-.27 1.91c-.1.68-.72 1.22-1.46 1.22zm-3.23-2h2.76l.37-2.55.53-.22c.44-.18.88-.44 1.34-.78l.45-.34 2.38.96 1.38-2.4-2.03-1.58.07-.56c.03-.26.06-.51.06-.78s-.03-.53-.06-.78l-.07-.56 2.03-1.58-1.39-2.4-2.39.96-.45-.35c-.42-.32-.87-.58-1.33-.77l-.52-.22-.37-2.55h-2.76l-.37 2.55-.53.21c-.44.19-.88.44-1.34.79l-.45.33-2.38-.95-1.39 2.39 2.03 1.58-.07.56c-.03.26-.06.53-.06.79s.02.53.06.78l.07.56-2.03 1.58 1.38 2.4 2.39-.96.45.35c.43.33.86.58 1.33.77l.53.22.38 2.55z"/>
<path
android:fillColor="#000000"
android:pathData="M 12, 12 m -3.5, 0 a 3.5,3.5 0 1,0 7,0 a 3.5,3.5 0 1,0 -7,0"/>
</vector>
\ No newline at end of file
chrome/android/features/autofill_assistant/java/res/drawable/ic_vpn_key_black_24dp.xml 0 → 100644
View file @ 71a1bf0a
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2020 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
tools:targetApi="21">
<path
android:fillColor="#000000"
android:pathData="M12.65 10C11.83 7.67 9.61 6 7 6c-3.31 0-6 2.69-6 6s2.69 6 6 6c2.61 0 4.83-1.67 5.65-4H17v4h4v-4h2v-4H12.65zM7 14c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2z"/>
</vector>
\ No newline at end of file
chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantDrawable.java
View file @ 71a1bf0a
......@@ -158,27 +158,42 @@ public abstract class AssistantDrawable {
mIcon = icon;
}
@Override
public void getDrawable(Context context, Callback<Drawable> callback) {
int resourceId;
private int getResourceId() {
switch (mIcon) {
case AssistantDrawableIcon.PROGRESSBAR_DEFAULT_INITIAL_STEP:
resourceId = R.drawable.ic_autofill_assistant_default_progress_start_black_24dp;
break;
return R.drawable.ic_autofill_assistant_default_progress_start_black_24dp;
case AssistantDrawableIcon.PROGRESSBAR_DEFAULT_DATA_COLLECTION:
resourceId = R.drawable.ic_shopping_basket_black_24dp;
break;
return R.drawable.ic_shopping_basket_black_24dp;
case AssistantDrawableIcon.PROGRESSBAR_DEFAULT_PAYMENT:
resourceId = R.drawable.ic_payment_black_24dp;
break;
return R.drawable.ic_payment_black_24dp;
case AssistantDrawableIcon.PROGRESSBAR_DEFAULT_FINAL_STEP:
resourceId = R.drawable.ic_check_circle_black_24dp;
break;
default:
resourceId = INVALID_ICON_ID;
break;
return R.drawable.ic_check_circle_black_24dp;
case AssistantDrawableIcon.SITTING_PERSON:
return R.drawable.ic_airline_seat_recline_normal_black_24dp;
case AssistantDrawableIcon.TICKET_STUB:
return R.drawable.ic_confirmation_number_black_24dp;
case AssistantDrawableIcon.SHOPPING_BASKET:
return R.drawable.ic_shopping_basket_black_24dp;
case AssistantDrawableIcon.FAST_FOOD:
return R.drawable.ic_fastfood_black_24dp;
case AssistantDrawableIcon.LOCAL_DINING:
return R.drawable.ic_local_dining_black_24dp;
case AssistantDrawableIcon.COGWHEEL:
return R.drawable.ic_settings_black_24dp;
case AssistantDrawableIcon.KEY:
return R.drawable.ic_vpn_key_black_24dp;
case AssistantDrawableIcon.CAR:
return R.drawable.ic_directions_car_black_24dp;
case AssistantDrawableIcon.GROCERY:
return R.drawable.ic_grocery_black_24dp;
}
return INVALID_ICON_ID;
}
@Override
public void getDrawable(Context context, Callback<Drawable> callback) {
int resourceId = getResourceId();
callback.onResult(resourceId == INVALID_ICON_ID
? null
: AppCompatResources.getDrawable(context, resourceId));
......
chrome/browser/android/autofill_assistant/ui_controller_android_utils.cc
View file @ 71a1bf0a
......@@ -33,6 +33,24 @@ DrawableIcon MapDrawableIcon(DrawableProto::Icon icon) {
return DrawableIcon::PROGRESSBAR_DEFAULT_PAYMENT;
case DrawableProto::PROGRESSBAR_DEFAULT_FINAL_STEP:
return DrawableIcon::PROGRESSBAR_DEFAULT_FINAL_STEP;
case DrawableProto::SITTING_PERSON:
return DrawableIcon::SITTING_PERSON;
case DrawableProto::TICKET_STUB:
return DrawableIcon::TICKET_STUB;
case DrawableProto::SHOPPING_BASKET:
return DrawableIcon::SHOPPING_BASKET;
case DrawableProto::FAST_FOOD:
return DrawableIcon::FAST_FOOD;
case DrawableProto::LOCAL_DINING:
return DrawableIcon::LOCAL_DINING;
case DrawableProto::COGWHEEL:
return DrawableIcon::COGWHEEL;
case DrawableProto::KEY:
return DrawableIcon::KEY;
case DrawableProto::CAR:
return DrawableIcon::CAR;
case DrawableProto::GROCERY:
return DrawableIcon::GROCERY;
}
}
......
components/autofill_assistant/browser/generic_ui_java_generated_enums.h
View file @ 71a1bf0a
......@@ -27,7 +27,16 @@ enum class DrawableIcon {
PROGRESSBAR_DEFAULT_INITIAL_STEP = 1,
PROGRESSBAR_DEFAULT_DATA_COLLECTION = 2,
PROGRESSBAR_DEFAULT_PAYMENT = 3,
PROGRESSBAR_DEFAULT_FINAL_STEP = 4
PROGRESSBAR_DEFAULT_FINAL_STEP = 4,
SITTING_PERSON = 5,
TICKET_STUB = 6,
SHOPPING_BASKET = 7,
FAST_FOOD = 8,
LOCAL_DINING = 9,
COGWHEEL = 10,
KEY = 11,
CAR = 12,
GROCERY = 13,
};
} // namespace autofill_assistant
......
components/autofill_assistant/browser/view_layout.proto
View file @ 71a1bf0a
......@@ -80,6 +80,15 @@ message DrawableProto {
PROGRESSBAR_DEFAULT_DATA_COLLECTION = 2;
PROGRESSBAR_DEFAULT_PAYMENT = 3;
PROGRESSBAR_DEFAULT_FINAL_STEP = 4;
SITTING_PERSON = 5;
TICKET_STUB = 6;
SHOPPING_BASKET = 7;
FAST_FOOD = 8;
LOCAL_DINING = 9;
COGWHEEL = 10;
KEY = 11;
CAR = 12;
GROCERY = 13;
}
oneof drawable {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment