diff options
| author | 2018-04-17 21:54:17 -0700 | |
|---|---|---|
| committer | 2018-04-17 21:54:17 -0700 | |
| commit | 7d01142c8952e44f19af2a80e25fe686c7ebcd47 (patch) | |
| tree | 896da3224226416cd65c211f730123307f38f985 | |
| parent | b03474b4f4d9adab65ba4be80c011e1242bf19e6 (diff) | |
| parent | 5b510f5c7bb6ffe39d3fceba065bb99ea53be828 (diff) | |
Merge "add changes to make the add user button up to spec" into pi-dev
am: 5b510f5c7b
Change-Id: If2824fe6db7094dc9d2c674976eb5c1669b21f82
3 files changed, 25 insertions, 1 deletions
diff --git a/packages/SystemUI/res/drawable/car_add_circle_round.xml b/packages/SystemUI/res/drawable/car_add_circle_round.xml new file mode 100644 index 000000000000..cb9515c9693f --- /dev/null +++ b/packages/SystemUI/res/drawable/car_add_circle_round.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item> + <shape android:shape="oval"> + <solid + android:color="@color/car_dark_blue_grey_600"/> + <size + android:width="@dimen/car_fullscreen_user_pod_image_avatar_width" + android:height="@dimen/car_fullscreen_user_pod_image_avatar_height"/> + </shape> + </item> + <item + android:drawable="@drawable/car_ic_add_white" + android:gravity="center"/> +</layer-list>
\ No newline at end of file diff --git a/packages/SystemUI/res/drawable/car_ic_add_white.xml b/packages/SystemUI/res/drawable/car_ic_add_white.xml new file mode 100644 index 000000000000..98b37bf306f7 --- /dev/null +++ b/packages/SystemUI/res/drawable/car_ic_add_white.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="@dimen/car_touch_target_size" + android:height="@dimen/car_touch_target_size" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="@color/car_body1_light" + android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/> +</vector>
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java index 41b70f8537e7..dbd1cd482305 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java @@ -185,7 +185,7 @@ public class UserGridRecyclerView extends PagedListView implements .getUserIcon(userRecord.mInfo)); } else { holder.mUserAvatarImageView.setImageDrawable(mContext - .getDrawable(R.drawable.ic_add_circle_qs)); + .getDrawable(R.drawable.car_add_circle_round)); } holder.mUserNameTextView.setText(userRecord.mInfo.name); holder.mView.setOnClickListener(v -> { |