Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32a4d8fc authored by Oli Lan's avatar Oli Lan Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I6802f6ab91da74b4386c1113dc19691b494305ec
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents abb2d8c2 9d1cf05c

packages/SettingsLib/src/com/android/settingslib/users/AvatarPickerActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ public class AvatarPickerActivity extends Activity { 
            mWaitingForActivityResult = savedInstanceState.getBoolean(KEY_AWAITING_RESULT, false);

            mAdapter.mSelectedPosition =

                    savedInstanceState.getInt(KEY_SELECTED_POSITION, AvatarAdapter.NONE);

            mDoneButton.setEnabled(mAdapter.mSelectedPosition != AvatarAdapter.NONE);

        }

    }

packages/SettingsLib/src/com/android/settingslib/users/EditUserInfoController.java

+5 −2
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ public class EditUserInfoController { 


    private Dialog mEditUserInfoDialog;

    private Bitmap mSavedPhoto;

    private Drawable mSavedDrawable;

    private EditUserPhotoController mEditUserPhotoController;

    private boolean mWaitingForActivityResult = false;

    private final String mFileAuthority;
@@ -68,6 +69,7 @@ public class EditUserInfoController { 
        }

        mEditUserInfoDialog = null;

        mSavedPhoto = null;

        mSavedDrawable = null;

    }



    /**
@@ -170,7 +172,8 @@ public class EditUserInfoController { 


    private Drawable getUserIcon(Activity activity, Drawable defaultUserIcon) {

        if (mSavedPhoto != null) {

            return CircleFramedDrawable.getInstance(activity, mSavedPhoto);

            mSavedDrawable = CircleFramedDrawable.getInstance(activity, mSavedPhoto);

            return mSavedDrawable;

        }

        return defaultUserIcon;

    }
@@ -229,6 +232,6 @@ public class EditUserInfoController { 
    EditUserPhotoController createEditUserPhotoController(Activity activity,

            ActivityStarter activityStarter, ImageView userPhotoView) {

        return new EditUserPhotoController(activity, activityStarter, userPhotoView,

                mSavedPhoto, mFileAuthority);

                mSavedPhoto, mSavedDrawable, mFileAuthority);

    }

}

packages/SettingsLib/src/com/android/settingslib/users/EditUserPhotoController.java

+4 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class EditUserPhotoController { 
    private Drawable mNewUserPhotoDrawable;



    public EditUserPhotoController(Activity activity, ActivityStarter activityStarter,

            ImageView view, Bitmap bitmap, String fileAuthority) {

            ImageView view, Bitmap savedBitmap, Drawable savedDrawable, String fileAuthority) {

        mActivity = activity;

        mActivityStarter = activityStarter;

        mFileAuthority = fileAuthority;
@@ -71,7 +71,9 @@ public class EditUserPhotoController { 
        mImagesDir.mkdir();

        mImageView = view;

        mImageView.setOnClickListener(v -> showAvatarPicker());

        mNewUserPhotoBitmap = bitmap;



        mNewUserPhotoBitmap = savedBitmap;

        mNewUserPhotoDrawable = savedDrawable;

    }



    /**