Emergency info button design change
- Remove emergency info observer , emergency info name will set by
user name.
- User icon will be default icon if user do not set photo.
Test: Manually
Bug: 80406570
Change-Id: I2ad8c7d00b5a98e06d7a91a20c82d8222e14723e
diff --git a/src/com/android/phone/EmergencyInfoGroup.java b/src/com/android/phone/EmergencyInfoGroup.java
index 576f3fc..d0dc322 100644
--- a/src/com/android/phone/EmergencyInfoGroup.java
+++ b/src/com/android/phone/EmergencyInfoGroup.java
@@ -97,6 +97,7 @@
visible = true;
}
+ mEmergencyInfoName.setText(getUserName());
setVisibility(visible ? View.VISIBLE : View.GONE);
}
@@ -104,34 +105,19 @@
/**
* Get user icon.
*
- * @return user icon, or anonymous avatar if user do not set photo.
+ * @return user icon, or default user icon if user do not set photo.
*/
private Drawable getCircularUserIcon() {
- final int userId = UserHandle.getCallingUserId();
-
final UserManager userManager = (UserManager) getContext().getSystemService(
Context.USER_SERVICE);
-
- // get user icon.
- Bitmap bitmapUserIcon = userManager.getUserIcon(userId);
+ Bitmap bitmapUserIcon = userManager.getUserIcon(UserHandle.getCallingUserId());
if (bitmapUserIcon == null) {
- // use anonymous avatar.
- return getContext().getDrawable(R.drawable.logo_avatar_anonymous_120);
+ // get default user icon.
+ final Drawable defaultUserIcon = UserIcons.getDefaultUserIcon(
+ getContext().getResources(), UserHandle.myUserId(), false);
+ bitmapUserIcon = UserIcons.convertToBitmap(defaultUserIcon);
}
-
- // get default user icon.
- Drawable drawableDefaultUserIcon = UserIcons.getDefaultUserIcon(
- getContext().getResources(), userId, false);
- Bitmap bitmapDefaultUserIcon = UserIcons.convertToBitmap(drawableDefaultUserIcon);
-
- // User icon is default icon that means user do not set photo, replacing default icon
- // with anonymous avatar on emergency info button.
- if (bitmapUserIcon.sameAs(bitmapDefaultUserIcon)) {
- return getContext().getDrawable(R.drawable.logo_avatar_anonymous_120);
- }
-
- // set user icon circular.
RoundedBitmapDrawable drawableUserIcon = RoundedBitmapDrawableFactory.create(
getContext().getResources(), bitmapUserIcon);
drawableUserIcon.setCircular(true);
@@ -139,6 +125,15 @@
return drawableUserIcon;
}
+ private CharSequence getUserName() {
+ final UserManager userManager = (UserManager) getContext().getSystemService(
+ Context.USER_SERVICE);
+ final String userName = userManager.getUserName();
+
+ return TextUtils.isEmpty(userName) ? getContext().getText(
+ R.string.emergency_information_owner_hint) : userName;
+ }
+
private void updateLayoutHeight() {
LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) getLayoutParams();
// Update height if mEmergencyInfoHint text line more than 1.
@@ -150,11 +145,4 @@
R.dimen.emergency_info_button_singleline_height);
setLayoutParams(params);
}
-
- void updateEmergencyInfo(String emergencyInfoName) {
- if (TextUtils.isEmpty(emergencyInfoName)) {
- emergencyInfoName = getContext().getString(R.string.emergency_information_owner_hint);
- }
- mEmergencyInfoName.setText(emergencyInfoName);
- }
}
\ No newline at end of file