Refactor User Profile editor dialog for reuse
Move the dialog code into a separate class. Use it from RestrictedProfileSettings and UserSettings for the current user. Bug: 15761405 Change-Id: I0b9a95ba8463304525e6a4b8cf3b4ca77b15796f
This commit is contained in:
Amith Yamasani
@@ -16,66 +16,35 @@
|
||||
|
||||
package com.android.settings.users;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.AlertDialog;
|
||||
import android.app.Dialog;
|
||||
import android.app.Fragment;
|
||||
import android.content.ClipData;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.content.pm.UserInfo;
|
||||
import android.database.Cursor;
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.Bitmap.Config;
|
||||
import android.graphics.BitmapFactory;
|
||||
import android.graphics.Canvas;
|
||||
import android.graphics.Paint;
|
||||
import android.graphics.Rect;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.net.Uri;
|
||||
import android.os.AsyncTask;
|
||||
import android.os.Bundle;
|
||||
import android.os.UserHandle;
|
||||
import android.provider.MediaStore;
|
||||
import android.provider.ContactsContract.DisplayPhoto;
|
||||
import android.support.v4.content.FileProvider;
|
||||
import android.text.TextUtils;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.WindowManager;
|
||||
import android.view.View.OnClickListener;
|
||||
import android.widget.AdapterView;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.EditText;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.ListAdapter;
|
||||
import android.widget.ListPopupWindow;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.android.settings.R;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.InputStream;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class RestrictedProfileSettings extends AppRestrictionsFragment {
|
||||
public class RestrictedProfileSettings extends AppRestrictionsFragment
|
||||
implements EditUserInfoController.OnContentChangedCallback {
|
||||
|
||||
private static final String KEY_SAVED_PHOTO = "pending_photo";
|
||||
private static final String KEY_AWAITING_RESULT = "awaiting_result";
|
||||
private static final int DIALOG_ID_EDIT_USER_INFO = 1;
|
||||
static final String KEY_SAVED_PHOTO = "pending_photo";
|
||||
static final String KEY_AWAITING_RESULT = "awaiting_result";
|
||||
static final int DIALOG_ID_EDIT_USER_INFO = 1;
|
||||
public static final String FILE_PROVIDER_AUTHORITY = "com.android.settings.files";
|
||||
|
||||
private View mHeaderView;
|
||||
private ImageView mUserIconView;
|
||||
private TextView mUserNameView;
|
||||
|
||||
private Dialog mEditUserInfoDialog;
|
||||
private EditUserPhotoController mEditUserPhotoController;
|
||||
private Bitmap mSavedPhoto;
|
||||
private EditUserInfoController mEditUserInfoController =
|
||||
new EditUserInfoController();
|
||||
private boolean mWaitingForActivityResult;
|
||||
|
||||
@Override
|
||||
@@ -83,7 +52,7 @@ public class RestrictedProfileSettings extends AppRestrictionsFragment {
|
||||
super.onCreate(icicle);
|
||||
|
||||
if (icicle != null) {
|
||||
mSavedPhoto = (Bitmap) icicle.getParcelable(KEY_SAVED_PHOTO);
|
||||
mEditUserInfoController.onRestoreInstanceState(icicle);
|
||||
mWaitingForActivityResult = icicle.getBoolean(KEY_AWAITING_RESULT, false);
|
||||
}
|
||||
|
||||
@@ -108,14 +77,7 @@ public class RestrictedProfileSettings extends AppRestrictionsFragment {
|
||||
@Override
|
||||
public void onSaveInstanceState(Bundle outState) {
|
||||
super.onSaveInstanceState(outState);
|
||||
if (mEditUserInfoDialog != null && mEditUserInfoDialog.isShowing()
|
||||
&& mEditUserPhotoController != null) {
|
||||
outState.putParcelable(KEY_SAVED_PHOTO,
|
||||
mEditUserPhotoController.getNewUserPhotoBitmap());
|
||||
}
|
||||
if (mWaitingForActivityResult) {
|
||||
outState.putBoolean(KEY_AWAITING_RESULT, mWaitingForActivityResult);
|
||||
}
|
||||
mEditUserInfoController.onSaveInstanceState(outState);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -145,19 +107,15 @@ public class RestrictedProfileSettings extends AppRestrictionsFragment {
|
||||
|
||||
@Override
|
||||
public void startActivityForResult(Intent intent, int requestCode) {
|
||||
mWaitingForActivityResult = true;
|
||||
mEditUserInfoController.startingActivityForResult();
|
||||
super.startActivityForResult(intent, requestCode);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||
super.onActivityResult(requestCode, resultCode, data);
|
||||
mWaitingForActivityResult = false;
|
||||
|
||||
if (mEditUserInfoDialog != null && mEditUserInfoDialog.isShowing()
|
||||
&& mEditUserPhotoController.onActivityResult(requestCode, resultCode, data)) {
|
||||
return;
|
||||
}
|
||||
mEditUserInfoController.onActivityResult(requestCode, resultCode, data);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -172,372 +130,21 @@ public class RestrictedProfileSettings extends AppRestrictionsFragment {
|
||||
@Override
|
||||
public Dialog onCreateDialog(int dialogId) {
|
||||
if (dialogId == DIALOG_ID_EDIT_USER_INFO) {
|
||||
if (mEditUserInfoDialog != null) {
|
||||
return mEditUserInfoDialog;
|
||||
}
|
||||
|
||||
LayoutInflater inflater = getActivity().getLayoutInflater();
|
||||
View content = inflater.inflate(R.layout.edit_user_info_dialog_content, null);
|
||||
|
||||
UserInfo info = mUserManager.getUserInfo(mUser.getIdentifier());
|
||||
|
||||
final EditText userNameView = (EditText) content.findViewById(R.id.user_name);
|
||||
userNameView.setText(info.name);
|
||||
|
||||
final ImageView userPhotoView = (ImageView) content.findViewById(R.id.user_photo);
|
||||
Drawable drawable = null;
|
||||
if (mSavedPhoto != null) {
|
||||
drawable = CircleFramedDrawable.getInstance(getActivity(), mSavedPhoto);
|
||||
} else {
|
||||
drawable = mUserIconView.getDrawable();
|
||||
if (drawable == null) {
|
||||
drawable = getCircularUserIcon();
|
||||
}
|
||||
}
|
||||
userPhotoView.setImageDrawable(drawable);
|
||||
mEditUserPhotoController = new EditUserPhotoController(this, userPhotoView,
|
||||
mSavedPhoto, drawable, mWaitingForActivityResult);
|
||||
|
||||
mEditUserInfoDialog = new AlertDialog.Builder(getActivity())
|
||||
.setTitle(R.string.profile_info_settings_title)
|
||||
.setView(content)
|
||||
.setCancelable(true)
|
||||
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
if (which == DialogInterface.BUTTON_POSITIVE) {
|
||||
// Update the name if changed.
|
||||
CharSequence userName = userNameView.getText();
|
||||
if (!TextUtils.isEmpty(userName)) {
|
||||
CharSequence oldUserName = mUserNameView.getText();
|
||||
if (oldUserName == null
|
||||
|| !userName.toString().equals(oldUserName.toString())) {
|
||||
((TextView) mHeaderView.findViewById(android.R.id.title))
|
||||
.setText(userName.toString());
|
||||
mUserManager.setUserName(mUser.getIdentifier(),
|
||||
userName.toString());
|
||||
}
|
||||
}
|
||||
// Update the photo if changed.
|
||||
Drawable drawable = mEditUserPhotoController.getNewUserPhotoDrawable();
|
||||
Bitmap bitmap = mEditUserPhotoController.getNewUserPhotoBitmap();
|
||||
if (drawable != null && bitmap != null
|
||||
&& !drawable.equals(mUserIconView.getDrawable())) {
|
||||
mUserIconView.setImageDrawable(drawable);
|
||||
new AsyncTask<Void, Void, Void>() {
|
||||
@Override
|
||||
protected Void doInBackground(Void... params) {
|
||||
mUserManager.setUserIcon(mUser.getIdentifier(),
|
||||
mEditUserPhotoController.getNewUserPhotoBitmap());
|
||||
return null;
|
||||
}
|
||||
}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void[]) null);
|
||||
}
|
||||
removeDialog(DIALOG_ID_EDIT_USER_INFO);
|
||||
}
|
||||
clearEditUserInfoDialog();
|
||||
}
|
||||
})
|
||||
.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
clearEditUserInfoDialog();
|
||||
}
|
||||
})
|
||||
.create();
|
||||
|
||||
// Make sure the IME is up.
|
||||
mEditUserInfoDialog.getWindow().setSoftInputMode(
|
||||
WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
|
||||
|
||||
return mEditUserInfoDialog;
|
||||
return mEditUserInfoController.createDialog(this, mUserIconView.getDrawable(),
|
||||
mUserNameView.getText(), R.string.profile_info_settings_title,
|
||||
this, mUser);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private void clearEditUserInfoDialog() {
|
||||
mEditUserInfoDialog = null;
|
||||
mSavedPhoto = null;
|
||||
@Override
|
||||
public void onPhotoChanged(Drawable photo) {
|
||||
mUserIconView.setImageDrawable(photo);
|
||||
}
|
||||
|
||||
private static class EditUserPhotoController {
|
||||
private static final int POPUP_LIST_ITEM_ID_CHOOSE_PHOTO = 1;
|
||||
private static final int POPUP_LIST_ITEM_ID_TAKE_PHOTO = 2;
|
||||
|
||||
// It seems that this class generates custom request codes and they may
|
||||
// collide with ours, these values are very unlikely to have a conflict.
|
||||
private static final int REQUEST_CODE_CHOOSE_PHOTO = 1;
|
||||
private static final int REQUEST_CODE_TAKE_PHOTO = 2;
|
||||
private static final int REQUEST_CODE_CROP_PHOTO = 3;
|
||||
|
||||
private static final String CROP_PICTURE_FILE_NAME = "CropEditUserPhoto.jpg";
|
||||
private static final String TAKE_PICTURE_FILE_NAME = "TakeEditUserPhoto2.jpg";
|
||||
|
||||
private final int mPhotoSize;
|
||||
|
||||
private final Context mContext;
|
||||
private final Fragment mFragment;
|
||||
private final ImageView mImageView;
|
||||
|
||||
private final Uri mCropPictureUri;
|
||||
private final Uri mTakePictureUri;
|
||||
|
||||
private Bitmap mNewUserPhotoBitmap;
|
||||
private Drawable mNewUserPhotoDrawable;
|
||||
|
||||
public EditUserPhotoController(Fragment fragment, ImageView view,
|
||||
Bitmap bitmap, Drawable drawable, boolean waiting) {
|
||||
mContext = view.getContext();
|
||||
mFragment = fragment;
|
||||
mImageView = view;
|
||||
mCropPictureUri = createTempImageUri(mContext, CROP_PICTURE_FILE_NAME, !waiting);
|
||||
mTakePictureUri = createTempImageUri(mContext, TAKE_PICTURE_FILE_NAME, !waiting);
|
||||
mPhotoSize = getPhotoSize(mContext);
|
||||
mImageView.setOnClickListener(new OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
showUpdatePhotoPopup();
|
||||
}
|
||||
});
|
||||
mNewUserPhotoBitmap = bitmap;
|
||||
mNewUserPhotoDrawable = drawable;
|
||||
}
|
||||
|
||||
public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||
if (resultCode != Activity.RESULT_OK) {
|
||||
return false;
|
||||
}
|
||||
final Uri pictureUri = data != null && data.getData() != null
|
||||
? data.getData() : mTakePictureUri;
|
||||
switch (requestCode) {
|
||||
case REQUEST_CODE_CROP_PHOTO:
|
||||
onPhotoCropped(pictureUri, true);
|
||||
return true;
|
||||
case REQUEST_CODE_TAKE_PHOTO:
|
||||
case REQUEST_CODE_CHOOSE_PHOTO:
|
||||
cropPhoto(pictureUri);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public Bitmap getNewUserPhotoBitmap() {
|
||||
return mNewUserPhotoBitmap;
|
||||
}
|
||||
|
||||
public Drawable getNewUserPhotoDrawable() {
|
||||
return mNewUserPhotoDrawable;
|
||||
}
|
||||
|
||||
private void showUpdatePhotoPopup() {
|
||||
final boolean canTakePhoto = canTakePhoto();
|
||||
final boolean canChoosePhoto = canChoosePhoto();
|
||||
|
||||
if (!canTakePhoto && !canChoosePhoto) {
|
||||
return;
|
||||
}
|
||||
|
||||
Context context = mImageView.getContext();
|
||||
final List<AdapterItem> items = new ArrayList<AdapterItem>();
|
||||
|
||||
if (canTakePhoto()) {
|
||||
String title = mImageView.getContext().getString( R.string.user_image_take_photo);
|
||||
AdapterItem item = new AdapterItem(title, POPUP_LIST_ITEM_ID_TAKE_PHOTO);
|
||||
items.add(item);
|
||||
}
|
||||
|
||||
if (canChoosePhoto) {
|
||||
String title = context.getString(R.string.user_image_choose_photo);
|
||||
AdapterItem item = new AdapterItem(title, POPUP_LIST_ITEM_ID_CHOOSE_PHOTO);
|
||||
items.add(item);
|
||||
}
|
||||
|
||||
final ListPopupWindow listPopupWindow = new ListPopupWindow(context);
|
||||
|
||||
listPopupWindow.setAnchorView(mImageView);
|
||||
listPopupWindow.setModal(true);
|
||||
listPopupWindow.setInputMethodMode(ListPopupWindow.INPUT_METHOD_NOT_NEEDED);
|
||||
|
||||
ListAdapter adapter = new ArrayAdapter<AdapterItem>(context,
|
||||
R.layout.edit_user_photo_popup_item, items);
|
||||
listPopupWindow.setAdapter(adapter);
|
||||
|
||||
final int width = Math.max(mImageView.getWidth(), context.getResources()
|
||||
.getDimensionPixelSize(R.dimen.update_user_photo_popup_min_width));
|
||||
listPopupWindow.setWidth(width);
|
||||
|
||||
listPopupWindow.setOnItemClickListener(new AdapterView.OnItemClickListener() {
|
||||
@Override
|
||||
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
|
||||
AdapterItem item = items.get(position);
|
||||
switch (item.id) {
|
||||
case POPUP_LIST_ITEM_ID_CHOOSE_PHOTO: {
|
||||
choosePhoto();
|
||||
listPopupWindow.dismiss();
|
||||
} break;
|
||||
case POPUP_LIST_ITEM_ID_TAKE_PHOTO: {
|
||||
takePhoto();
|
||||
listPopupWindow.dismiss();
|
||||
} break;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
listPopupWindow.show();
|
||||
}
|
||||
|
||||
private boolean canTakePhoto() {
|
||||
return mImageView.getContext().getPackageManager().queryIntentActivities(
|
||||
new Intent(MediaStore.ACTION_IMAGE_CAPTURE),
|
||||
PackageManager.MATCH_DEFAULT_ONLY).size() > 0;
|
||||
}
|
||||
|
||||
private boolean canChoosePhoto() {
|
||||
Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
|
||||
intent.setType("image/*");
|
||||
return mImageView.getContext().getPackageManager().queryIntentActivities(
|
||||
intent, 0).size() > 0;
|
||||
}
|
||||
|
||||
private void takePhoto() {
|
||||
Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
|
||||
appendOutputExtra(intent, mTakePictureUri);
|
||||
mFragment.startActivityForResult(intent, REQUEST_CODE_TAKE_PHOTO);
|
||||
}
|
||||
|
||||
private void choosePhoto() {
|
||||
Intent intent = new Intent(Intent.ACTION_GET_CONTENT, null);
|
||||
intent.setType("image/*");
|
||||
appendOutputExtra(intent, mTakePictureUri);
|
||||
mFragment.startActivityForResult(intent, REQUEST_CODE_CHOOSE_PHOTO);
|
||||
}
|
||||
|
||||
private void cropPhoto(Uri pictureUri) {
|
||||
// TODO: Use a public intent, when there is one.
|
||||
Intent intent = new Intent("com.android.camera.action.CROP");
|
||||
intent.setDataAndType(pictureUri, "image/*");
|
||||
appendOutputExtra(intent, mCropPictureUri);
|
||||
appendCropExtras(intent);
|
||||
if (intent.resolveActivity(mContext.getPackageManager()) != null) {
|
||||
mFragment.startActivityForResult(intent, REQUEST_CODE_CROP_PHOTO);
|
||||
} else {
|
||||
onPhotoCropped(pictureUri, false);
|
||||
}
|
||||
}
|
||||
|
||||
private void appendOutputExtra(Intent intent, Uri pictureUri) {
|
||||
intent.putExtra(MediaStore.EXTRA_OUTPUT, pictureUri);
|
||||
intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION
|
||||
| Intent.FLAG_GRANT_READ_URI_PERMISSION);
|
||||
intent.setClipData(ClipData.newRawUri(MediaStore.EXTRA_OUTPUT, pictureUri));
|
||||
}
|
||||
|
||||
private void appendCropExtras(Intent intent) {
|
||||
intent.putExtra("crop", "true");
|
||||
intent.putExtra("scale", true);
|
||||
intent.putExtra("scaleUpIfNeeded", true);
|
||||
intent.putExtra("aspectX", 1);
|
||||
intent.putExtra("aspectY", 1);
|
||||
intent.putExtra("outputX", mPhotoSize);
|
||||
intent.putExtra("outputY", mPhotoSize);
|
||||
}
|
||||
|
||||
private void onPhotoCropped(final Uri data, final boolean cropped) {
|
||||
new AsyncTask<Void, Void, Bitmap>() {
|
||||
@Override
|
||||
protected Bitmap doInBackground(Void... params) {
|
||||
if (cropped) {
|
||||
try {
|
||||
InputStream imageStream = mContext.getContentResolver()
|
||||
.openInputStream(data);
|
||||
return BitmapFactory.decodeStream(imageStream);
|
||||
} catch (FileNotFoundException fe) {
|
||||
return null;
|
||||
}
|
||||
} else {
|
||||
// Scale and crop to a square aspect ratio
|
||||
Bitmap croppedImage = Bitmap.createBitmap(mPhotoSize, mPhotoSize,
|
||||
Config.ARGB_8888);
|
||||
Canvas canvas = new Canvas(croppedImage);
|
||||
Bitmap fullImage = null;
|
||||
try {
|
||||
InputStream imageStream = mContext.getContentResolver()
|
||||
.openInputStream(data);
|
||||
fullImage = BitmapFactory.decodeStream(imageStream);
|
||||
} catch (FileNotFoundException fe) {
|
||||
return null;
|
||||
}
|
||||
if (fullImage != null) {
|
||||
final int squareSize = Math.min(fullImage.getWidth(),
|
||||
fullImage.getHeight());
|
||||
final int left = (fullImage.getWidth() - squareSize) / 2;
|
||||
final int top = (fullImage.getHeight() - squareSize) / 2;
|
||||
Rect rectSource = new Rect(left, top,
|
||||
left + squareSize, top + squareSize);
|
||||
Rect rectDest = new Rect(0, 0, mPhotoSize, mPhotoSize);
|
||||
Paint paint = new Paint();
|
||||
canvas.drawBitmap(fullImage, rectSource, rectDest, paint);
|
||||
return croppedImage;
|
||||
} else {
|
||||
// Bah! Got nothin.
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onPostExecute(Bitmap bitmap) {
|
||||
if (bitmap != null) {
|
||||
mNewUserPhotoBitmap = bitmap;
|
||||
mNewUserPhotoDrawable = CircleFramedDrawable
|
||||
.getInstance(mImageView.getContext(), mNewUserPhotoBitmap);
|
||||
mImageView.setImageDrawable(mNewUserPhotoDrawable);
|
||||
}
|
||||
new File(mContext.getCacheDir(), TAKE_PICTURE_FILE_NAME).delete();
|
||||
new File(mContext.getCacheDir(), CROP_PICTURE_FILE_NAME).delete();
|
||||
}
|
||||
}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void[]) null);
|
||||
}
|
||||
|
||||
private static int getPhotoSize(Context context) {
|
||||
Cursor cursor = context.getContentResolver().query(
|
||||
DisplayPhoto.CONTENT_MAX_DIMENSIONS_URI,
|
||||
new String[]{DisplayPhoto.DISPLAY_MAX_DIM}, null, null, null);
|
||||
try {
|
||||
cursor.moveToFirst();
|
||||
return cursor.getInt(0);
|
||||
} finally {
|
||||
cursor.close();
|
||||
}
|
||||
}
|
||||
|
||||
private Uri createTempImageUri(Context context, String fileName, boolean purge) {
|
||||
final File folder = context.getCacheDir();
|
||||
folder.mkdirs();
|
||||
final File fullPath = new File(folder, fileName);
|
||||
if (purge) {
|
||||
fullPath.delete();
|
||||
}
|
||||
final Uri fileUri =
|
||||
FileProvider.getUriForFile(context, FILE_PROVIDER_AUTHORITY, fullPath);
|
||||
return fileUri;
|
||||
}
|
||||
|
||||
private static final class AdapterItem {
|
||||
final String title;
|
||||
final int id;
|
||||
|
||||
public AdapterItem(String title, int id) {
|
||||
this.title = title;
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return title;
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public void onLabelChanged(CharSequence label) {
|
||||
mUserNameView.setText(label);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user