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

Commit eb3be7b2 authored by Anna Bauza's avatar Anna Bauza Committed by Automerger Merge Worker
Browse files

Merge "Integrating new Avatar Picker App in Settings" into main am: a5c94e61 

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



Change-Id: I64d5be9443441fd1eb337970a9a67bfa97cfb533
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8cb9033e a5c94e61

core/java/android/content/pm/multiuser.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -56,3 +56,11 @@ flag { 
    description: "Add support to lock private space automatically after a time period"

    bug: "303201022"

}



flag {

    name: "avatar_sync"

    namespace: "multiuser"

    description: "Implement new Avatar Picker outside of SetttingsLib with ability to select avatars from Google Account and synchronise to any changes."

    bug: "296829976"

    is_fixed_read_only: true

}

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

+11 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.res.Resources; 
import android.graphics.Bitmap;

import android.graphics.BitmapFactory;

import android.graphics.drawable.Drawable;

import android.multiuser.Flags;

import android.net.Uri;

import android.util.Log;

import android.widget.ImageView;
@@ -59,6 +60,9 @@ public class EditUserPhotoController { 
    private static final String IMAGES_DIR = "multi_user";

    private static final String NEW_USER_PHOTO_FILE_NAME = "NewUserPhoto.png";



    private static final String AVATAR_PICKER_ACTION = "com.android.avatarpicker"

            + ".FULL_SCREEN_ACTIVITY";



    private final Activity mActivity;

    private final ActivityStarter mActivityStarter;

    private final ImageView mImageView;
@@ -105,7 +109,6 @@ public class EditUserPhotoController { 
                onPhotoCropped(data.getData());

                return true;

            }



        }

        return false;

    }
@@ -115,7 +118,13 @@ public class EditUserPhotoController { 
    }



    private void showAvatarPicker() {

        Intent intent = new Intent(mImageView.getContext(), AvatarPickerActivity.class);

        Intent intent;

        if (Flags.avatarSync()) {

            intent = new Intent(AVATAR_PICKER_ACTION);

            intent.addCategory(Intent.CATEGORY_DEFAULT);

        } else {

            intent = new Intent(mImageView.getContext(), AvatarPickerActivity.class);

        }

        intent.putExtra(AvatarPickerActivity.EXTRA_FILE_AUTHORITY, mFileAuthority);

        mActivityStarter.startActivityForResult(intent, REQUEST_CODE_PICK_AVATAR);

    }