Merge "Flag removal: AvatarSync" into main (f901d0eb) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/users/UserSettings.java

+6 −10

Original line number	Diff line number	Diff line
		@@ -942,23 +942,19 @@ public class UserSettings extends SettingsPreferenceFragment
		UserIcons.convertToBitmapAtUserIconSize(
		activity.getResources(), newUserIcon)));
		mMePreference.setIcon(newUserIcon);
		if (Flags.avatarSync()) {
		final String pkg = getString(R.string.config_avatar_picker_package);
		final String action = pkg + ".set.confirm";
		activity.sendBroadcast(new Intent(action).setPackage(pkg));
		}
		}

		if (!TextUtils.isEmpty(newUserName) && !newUserName.equals(user.name)) {
		mMePreference.setTitle(newUserName);
		mUserManager.setUserName(user.id, newUserName);
		}
		}, () -> {
		if (Flags.avatarSync()) {
		final String pkg = getString(R.string.config_avatar_picker_package);
		final String action = pkg + ".set.cancel";
		activity.sendBroadcast(new Intent(action).setPackage(pkg));
		}
		});
		}