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

Merge "Fix avatar picker issues relating to screen rotation." into tm-dev am: 9d1cf05c83

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

Change-Id: If4f3ab9590e8debf81c6fa73719c2063ccd29ff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Oli Lan
2022-05-10 20:27:47 +00:00
committed by Automerger Merge Worker
parent 2bceeb9dbb 9d1cf05c83
commit 9722ab7dcd
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SettingsLib/src/com/android/settingslib/users/AvatarPickerActivity.java
View File

@@ -147,6 +147,7 @@ public class AvatarPickerActivity extends Activity {
mWaitingForActivityResult = savedInstanceState.getBoolean(KEY_AWAITING_RESULT, false); mWaitingForActivityResult = savedInstanceState.getBoolean(KEY_AWAITING_RESULT, false);
mAdapter.mSelectedPosition = mAdapter.mSelectedPosition =
savedInstanceState.getInt(KEY_SELECTED_POSITION, AvatarAdapter.NONE); savedInstanceState.getInt(KEY_SELECTED_POSITION, AvatarAdapter.NONE);
mDoneButton.setEnabled(mAdapter.mSelectedPosition != AvatarAdapter.NONE);
} }
} }

7
packages/SettingsLib/src/com/android/settingslib/users/EditUserInfoController.java
View File

@@ -54,6 +54,7 @@ public class EditUserInfoController {
private Dialog mEditUserInfoDialog; private Dialog mEditUserInfoDialog;
private Bitmap mSavedPhoto; private Bitmap mSavedPhoto;
private Drawable mSavedDrawable;
private EditUserPhotoController mEditUserPhotoController; private EditUserPhotoController mEditUserPhotoController;
private boolean mWaitingForActivityResult = false; private boolean mWaitingForActivityResult = false;
private final String mFileAuthority; private final String mFileAuthority;
@@ -68,6 +69,7 @@ public class EditUserInfoController {
} }
mEditUserInfoDialog = null; mEditUserInfoDialog = null;
mSavedPhoto = null; mSavedPhoto = null;
mSavedDrawable = null;
} }
/** /**
@@ -170,7 +172,8 @@ public class EditUserInfoController {
private Drawable getUserIcon(Activity activity, Drawable defaultUserIcon) { private Drawable getUserIcon(Activity activity, Drawable defaultUserIcon) {
if (mSavedPhoto != null) { if (mSavedPhoto != null) {
return CircleFramedDrawable.getInstance(activity, mSavedPhoto); mSavedDrawable = CircleFramedDrawable.getInstance(activity, mSavedPhoto);
return mSavedDrawable;
} }
return defaultUserIcon; return defaultUserIcon;
} }
@@ -229,6 +232,6 @@ public class EditUserInfoController {
EditUserPhotoController createEditUserPhotoController(Activity activity, EditUserPhotoController createEditUserPhotoController(Activity activity,
ActivityStarter activityStarter, ImageView userPhotoView) { ActivityStarter activityStarter, ImageView userPhotoView) {
return new EditUserPhotoController(activity, activityStarter, userPhotoView, return new EditUserPhotoController(activity, activityStarter, userPhotoView,
mSavedPhoto, mFileAuthority); mSavedPhoto, mSavedDrawable, mFileAuthority);
} }
} }

6
packages/SettingsLib/src/com/android/settingslib/users/EditUserPhotoController.java
View File

@@ -62,7 +62,7 @@ public class EditUserPhotoController {
private Drawable mNewUserPhotoDrawable; private Drawable mNewUserPhotoDrawable;
public EditUserPhotoController(Activity activity, ActivityStarter activityStarter, public EditUserPhotoController(Activity activity, ActivityStarter activityStarter,
ImageView view, Bitmap bitmap, String fileAuthority) { ImageView view, Bitmap savedBitmap, Drawable savedDrawable, String fileAuthority) {
mActivity = activity; mActivity = activity;
mActivityStarter = activityStarter; mActivityStarter = activityStarter;
mFileAuthority = fileAuthority; mFileAuthority = fileAuthority;
@@ -71,7 +71,9 @@ public class EditUserPhotoController {
mImagesDir.mkdir(); mImagesDir.mkdir();
mImageView = view; mImageView = view;
mImageView.setOnClickListener(v -> showAvatarPicker()); mImageView.setOnClickListener(v -> showAvatarPicker());
mNewUserPhotoBitmap = bitmap;
mNewUserPhotoBitmap = savedBitmap;
mNewUserPhotoDrawable = savedDrawable;
} }
/** /**