diff --git a/packages/SystemUI/res/color/qs_user_detail_name.xml b/packages/SystemUI/res/color/qs_user_detail_name.xml new file mode 100644 index 0000000000000..8ddb9be1d3193 --- /dev/null +++ b/packages/SystemUI/res/color/qs_user_detail_name.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/packages/SystemUI/res/drawable/ic_account_circle_qs.xml b/packages/SystemUI/res/drawable/ic_account_circle_qs.xml new file mode 100644 index 0000000000000..0d5cd2e34f511 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_account_circle_qs.xml @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/packages/SystemUI/res/drawable/ic_account_circle_qs_muted.xml b/packages/SystemUI/res/drawable/ic_account_circle_qs_muted.xml new file mode 100644 index 0000000000000..afcddf1414d24 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_account_circle_qs_muted.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + diff --git a/packages/SystemUI/res/layout/qs_user_detail_item.xml b/packages/SystemUI/res/layout/qs_user_detail_item.xml index 00b3645a344a5..29d92e543cf02 100644 --- a/packages/SystemUI/res/layout/qs_user_detail_item.xml +++ b/packages/SystemUI/res/layout/qs_user_detail_item.xml @@ -16,6 +16,7 @@ ~ limitations under the License --> + + android:textColor="@color/qs_user_detail_name" /> \ No newline at end of file diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index adab2437e1b69..a7f894cb42aea 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -46,6 +46,7 @@ #33FFFFFF #FFFFFFFF #FFFFFFFF + #4DB0BEC5 #ff686868 diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java index ec5f28cfd5d9e..3c647ed9dbf2a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java @@ -89,7 +89,7 @@ public class UserDetailView extends GridView { name = item.info.name; } if (item.picture == null) { - v.bind(name, mContext.getDrawable(R.drawable.ic_account_circle)); + v.bind(name, mContext.getDrawable(R.drawable.ic_account_circle_qs)); } else { v.bind(name, item.picture); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java index 6f2642a674258..93561aaf2f08c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java @@ -216,4 +216,17 @@ public class UserAvatarView extends View { super.invalidateDrawable(dr); } } + + @Override + protected boolean verifyDrawable(Drawable who) { + return who == mDrawable || super.verifyDrawable(who); + } + + @Override + protected void drawableStateChanged() { + super.drawableStateChanged(); + if (mDrawable != null && mDrawable.isStateful()) { + mDrawable.setState(getDrawableState()); + } + } }