Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "UX polishing for profile switcher. - Adjust the badge size. - Add badge to 'Add profile' button." into sc-v2-dev am: 2259b0e401

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16076408

Change-Id: Ie9025c8804c5d77046f9800fd19852edd8fe2136
This commit is contained in:
BK Choi
2021-10-27 16:30:07 +00:00
committed by Automerger Merge Worker
parent aa3f35a96b 2259b0e401
commit ca7f80f49e
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values/dimens_car.xml
View File

@@ -17,7 +17,7 @@
--> -->
<resources> <resources>
<dimen name="car_large_avatar_size">96dp</dimen> <dimen name="car_large_avatar_size">96dp</dimen>
<dimen name="car_large_avatar_badge_size">32dp</dimen> <dimen name="car_large_avatar_badge_size">24dp</dimen>
<!-- Application Bar --> <!-- Application Bar -->
<dimen name="car_app_bar_height">80dp</dimen> <dimen name="car_app_bar_height">80dp</dimen>
<!-- Margin --> <!-- Margin -->

14
packages/SettingsLib/src/com/android/settingslib/drawable/UserIconDrawable.java
View File

@@ -183,6 +183,20 @@ public class UserIconDrawable extends Drawable implements Drawable.Callback {
return setBadge(badge); return setBadge(badge);
} }
/**
* Sets the managed badge to this user icon if the device has a device owner.
*/
public UserIconDrawable setBadgeIfManagedDevice(Context context) {
Drawable badge = null;
boolean deviceOwnerExists = context.getSystemService(DevicePolicyManager.class)
.getDeviceOwnerComponentOnAnyUser() != null;
if (deviceOwnerExists) {
badge = getDrawableForDisplayDensity(
context, com.android.internal.R.drawable.ic_corp_badge_case);
}
return setBadge(badge);
}
public void setBadgeRadius(float radius) { public void setBadgeRadius(float radius) {
mBadgeRadius = radius; mBadgeRadius = radius;
onBoundsChange(getBounds()); onBoundsChange(getBounds());