PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix profile photo chooser"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-08-07 23:10:12 +00:00
committed by Android (Google) Code Review
parent 4453a60c17 dbe907b2cf
commit 06c9bd2cdb
2 changed files with 138 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/users/EditUserInfoController.java
View File

@@ -41,6 +41,7 @@ import com.android.settingslib.drawable.CircleFramedDrawable;
import java.io.File;
import androidx.appcompat.app.AlertDialog;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
/**
@@ -103,9 +104,8 @@ public class EditUserInfoController {
public void onActivityResult(int requestCode, int resultCode, Intent data) {
mWaitingForActivityResult = false;
if (mEditUserInfoDialog != null && mEditUserInfoDialog.isShowing()
&& mEditUserPhotoController.onActivityResult(requestCode, resultCode, data)) {
return;
if (mEditUserInfoDialog != null) {
mEditUserPhotoController.onActivityResult(requestCode, resultCode, data);
}
}
@@ -115,7 +115,7 @@ public class EditUserInfoController {
Activity activity = fragment.getActivity();
mUser = user;
if (mUserManager == null) {
mUserManager = UserManager.get(activity);
mUserManager = activity.getSystemService(UserManager.class);
}
LayoutInflater inflater = activity.getLayoutInflater();
View content = inflater.inflate(R.layout.edit_user_info_dialog_content, null);
@@ -136,8 +136,7 @@ public class EditUserInfoController {
}
}
userPhotoView.setImageDrawable(drawable);
mEditUserPhotoController = new EditUserPhotoController(fragment, userPhotoView,
mSavedPhoto, drawable, mWaitingForActivityResult);
mEditUserPhotoController = createEditUserPhotoController(fragment, userPhotoView, drawable);
mEditUserInfoDialog = new AlertDialog.Builder(activity)
.setTitle(R.string.profile_info_settings_title)
.setView(content)
@@ -195,4 +194,11 @@ public class EditUserInfoController {
return mEditUserInfoDialog;
}
@VisibleForTesting
EditUserPhotoController createEditUserPhotoController(Fragment fragment,
ImageView userPhotoView, Drawable drawable) {
return new EditUserPhotoController(fragment, userPhotoView,
mSavedPhoto, drawable, mWaitingForActivityResult);
}
}