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

Merge "Update dialog to edit user info" into udc-qpr-dev

Browse Source
This commit is contained in:
Tetiana Meronyk
2023-06-13 09:36:14 +00:00
committed by Android (Google) Code Review
parent fed13de90e 25d5b6cf27
commit d267276bac
7 changed files with 88 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SettingsLib/res/layout/dialog_with_icon.xml
View File

@@ -41,7 +41,6 @@
android:id="@+id/dialog_with_icon_message" android:id="@+id/dialog_with_icon_message"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="10dp"
android:gravity="center" android:gravity="center"
style="@style/TextAppearanceSmall"/> style="@style/TextAppearanceSmall"/>

88
packages/SettingsLib/res/layout/edit_user_info_dialog_content.xml
View File

@@ -14,62 +14,48 @@
limitations under the License. limitations under the License.
--> -->
<ScrollView <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/user_info_editor"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/user_info_scroll" android:baselineAligned="false"
android:padding="16dp"> android:orientation="vertical">
<FrameLayout
<LinearLayout android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:baselineAligned="false" android:layout_gravity="center">
android:orientation="vertical"> <ImageView
<TextView android:id="@+id/user_photo"
android:id="@+id/user_info_title" android:layout_width="@dimen/user_photo_size_in_user_info_dialog"
android:gravity="center" android:layout_height="@dimen/user_photo_size_in_user_info_dialog"
android:layout_width="match_parent" android:contentDescription="@string/user_image_photo_selector"
android:layout_height="wrap_content" android:scaleType="fitCenter"/>
style="@style/EditUserDialogTitle" <ImageView
android:text="@string/user_info_settings_title" android:id="@+id/add_a_photo_icon"
android:textDirection="locale"/> android:layout_width="@dimen/add_a_photo_icon_size_in_user_info_dialog"
<FrameLayout android:layout_height="@dimen/add_a_photo_icon_size_in_user_info_dialog"
android:layout_width="wrap_content" android:src="@drawable/add_a_photo_circled"
android:layout_height="wrap_content" android:layout_gravity="bottom|right"/>
android:layout_gravity="center"> </FrameLayout>
<ImageView
android:id="@+id/user_photo"
android:layout_width="@dimen/user_photo_size_in_user_info_dialog"
android:layout_height="@dimen/user_photo_size_in_user_info_dialog"
android:contentDescription="@string/user_image_photo_selector"
android:scaleType="fitCenter"/>
<ImageView
android:id="@+id/add_a_photo_icon"
android:layout_width="@dimen/add_a_photo_icon_size_in_user_info_dialog"
android:layout_height="@dimen/add_a_photo_icon_size_in_user_info_dialog"
android:src="@drawable/add_a_photo_circled"
android:layout_gravity="bottom|right"/>
</FrameLayout>
<EditText <EditText
android:id="@+id/user_name" android:id="@+id/user_name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/user_name_height_in_user_info_dialog" android:layout_height="@dimen/user_name_height_in_user_info_dialog"
android:layout_gravity="center" android:layout_gravity="center"
android:minWidth="200dp" android:minWidth="200dp"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:minHeight="@dimen/min_tap_target_size" android:minHeight="@dimen/min_tap_target_size"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:inputType="text|textCapWords" android:inputType="text|textCapWords"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:hint="@string/user_nickname" android:hint="@string/user_nickname"
android:maxLength="100"/> android:maxLength="100"/>
</LinearLayout> </LinearLayout>
</ScrollView>

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

@@ -59,6 +59,7 @@ public class CreateUserDialogController {
private static final String KEY_IS_ADMIN = "admin_status"; private static final String KEY_IS_ADMIN = "admin_status";
private static final String KEY_ADD_USER_LONG_MESSAGE_DISPLAYED = private static final String KEY_ADD_USER_LONG_MESSAGE_DISPLAYED =
"key_add_user_long_message_displayed"; "key_add_user_long_message_displayed";
public static final int MESSAGE_PADDING = 10;
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({EXIT_DIALOG, INITIAL_DIALOG, GRANT_ADMIN_DIALOG, @IntDef({EXIT_DIALOG, INITIAL_DIALOG, GRANT_ADMIN_DIALOG,
@@ -191,6 +192,7 @@ public class CreateUserDialogController {
cancelCallback.run(); cancelCallback.run();
clear(); clear();
}); });
mCustomDialogHelper.setMessagePadding(MESSAGE_PADDING);
mUserCreationDialog.setCanceledOnTouchOutside(true); mUserCreationDialog.setCanceledOnTouchOutside(true);
return mUserCreationDialog; return mUserCreationDialog;
} }
@@ -212,7 +214,6 @@ public class CreateUserDialogController {
} }
updateLayout(); updateLayout();
}); });
return;
} }
private void updateLayout() { private void updateLayout() {
@@ -234,7 +235,6 @@ public class CreateUserDialogController {
} }
Drawable icon = mActivity.getDrawable(R.drawable.ic_person_add); Drawable icon = mActivity.getDrawable(R.drawable.ic_person_add);
mCustomDialogHelper.setVisibility(mCustomDialogHelper.ICON, true) mCustomDialogHelper.setVisibility(mCustomDialogHelper.ICON, true)
.setVisibility(mCustomDialogHelper.TITLE, true)
.setVisibility(mCustomDialogHelper.MESSAGE, true) .setVisibility(mCustomDialogHelper.MESSAGE, true)
.setIcon(icon) .setIcon(icon)
.setButtonEnabled(true) .setButtonEnabled(true)
@@ -248,7 +248,6 @@ public class CreateUserDialogController {
mGrantAdminView.setVisibility(View.VISIBLE); mGrantAdminView.setVisibility(View.VISIBLE);
mCustomDialogHelper mCustomDialogHelper
.setVisibility(mCustomDialogHelper.ICON, true) .setVisibility(mCustomDialogHelper.ICON, true)
.setVisibility(mCustomDialogHelper.TITLE, true)
.setVisibility(mCustomDialogHelper.MESSAGE, true) .setVisibility(mCustomDialogHelper.MESSAGE, true)
.setIcon(mActivity.getDrawable(R.drawable.ic_admin_panel_settings)) .setIcon(mActivity.getDrawable(R.drawable.ic_admin_panel_settings))
.setTitle(R.string.user_grant_admin_title) .setTitle(R.string.user_grant_admin_title)
@@ -262,8 +261,8 @@ public class CreateUserDialogController {
case EDIT_NAME_DIALOG: case EDIT_NAME_DIALOG:
mCustomDialogHelper mCustomDialogHelper
.setVisibility(mCustomDialogHelper.ICON, false) .setVisibility(mCustomDialogHelper.ICON, false)
.setVisibility(mCustomDialogHelper.TITLE, false)
.setVisibility(mCustomDialogHelper.MESSAGE, false) .setVisibility(mCustomDialogHelper.MESSAGE, false)
.setTitle(R.string.user_info_settings_title)
.setNegativeButtonText(R.string.back) .setNegativeButtonText(R.string.back)
.setPositiveButtonText(R.string.done); .setPositiveButtonText(R.string.done);
mEditUserInfoView.setVisibility(View.VISIBLE); mEditUserInfoView.setVisibility(View.VISIBLE);

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

@@ -17,7 +17,6 @@
package com.android.settingslib.users; package com.android.settingslib.users;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -31,7 +30,6 @@ import android.view.View;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.ScrollView;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
@@ -41,6 +39,7 @@ import com.android.settingslib.R;
import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.drawable.CircleFramedDrawable; import com.android.settingslib.drawable.CircleFramedDrawable;
import com.android.settingslib.utils.CustomDialogHelper;
import java.io.File; import java.io.File;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
@@ -128,7 +127,7 @@ public class EditUserInfoController {
* codes to take photo/choose photo/crop photo. * codes to take photo/choose photo/crop photo.
*/ */
public Dialog createDialog(Activity activity, ActivityStarter activityStarter, public Dialog createDialog(Activity activity, ActivityStarter activityStarter,
@Nullable Drawable oldUserIcon, String defaultUserName, String title, @Nullable Drawable oldUserIcon, String defaultUserName,
BiConsumer<String, Drawable> successCallback, Runnable cancelCallback) { BiConsumer<String, Drawable> successCallback, Runnable cancelCallback) {
LayoutInflater inflater = LayoutInflater.from(activity); LayoutInflater inflater = LayoutInflater.from(activity);
View content = inflater.inflate(R.layout.edit_user_info_dialog_content, null); View content = inflater.inflate(R.layout.edit_user_info_dialog_content, null);
@@ -160,10 +159,8 @@ public class EditUserInfoController {
userPhotoView); userPhotoView);
} }
} }
ScrollView scrollView = content.findViewById(R.id.user_info_scroll);
scrollView.setClipToOutline(true);
mEditUserInfoDialog = buildDialog(activity, content, userNameView, oldUserIcon, mEditUserInfoDialog = buildDialog(activity, content, userNameView, oldUserIcon,
defaultUserName, title, successCallback, cancelCallback); defaultUserName, successCallback, cancelCallback);
// Make sure the IME is up. // Make sure the IME is up.
mEditUserInfoDialog.getWindow() mEditUserInfoDialog.getWindow()
@@ -181,12 +178,13 @@ public class EditUserInfoController {
} }
private Dialog buildDialog(Activity activity, View content, EditText userNameView, private Dialog buildDialog(Activity activity, View content, EditText userNameView,
@Nullable Drawable oldUserIcon, String defaultUserName, String title, @Nullable Drawable oldUserIcon, String defaultUserName,
BiConsumer<String, Drawable> successCallback, Runnable cancelCallback) { BiConsumer<String, Drawable> successCallback, Runnable cancelCallback) {
return new AlertDialog.Builder(activity) CustomDialogHelper dialogHelper = new CustomDialogHelper(activity);
.setView(content) dialogHelper
.setCancelable(true) .setTitle(R.string.user_info_settings_title)
.setPositiveButton(android.R.string.ok, (dialog, which) -> { .addCustomView(content)
.setPositiveButton(android.R.string.ok, view -> {
Drawable newUserIcon = mEditUserPhotoController != null Drawable newUserIcon = mEditUserPhotoController != null
? mEditUserPhotoController.getNewUserPhotoDrawable() ? mEditUserPhotoController.getNewUserPhotoDrawable()
: null; : null;
@@ -201,20 +199,23 @@ public class EditUserInfoController {
if (successCallback != null) { if (successCallback != null) {
successCallback.accept(userName, userIcon); successCallback.accept(userName, userIcon);
} }
dialogHelper.getDialog().dismiss();
}) })
.setNegativeButton(android.R.string.cancel, (dialog, which) -> { .setBackButton(android.R.string.cancel, view -> {
clear(); clear();
if (cancelCallback != null) { if (cancelCallback != null) {
cancelCallback.run(); cancelCallback.run();
} }
}) dialogHelper.getDialog().dismiss();
.setOnCancelListener(dialog -> { });
clear(); dialogHelper.getDialog().setOnCancelListener(dialog -> {
if (cancelCallback != null) { clear();
cancelCallback.run(); if (cancelCallback != null) {
} cancelCallback.run();
}) }
.create(); dialogHelper.getDialog().dismiss();
});
return dialogHelper.getDialog();
} }
@VisibleForTesting @VisibleForTesting

8
packages/SettingsLib/src/com/android/settingslib/utils/CustomDialogHelper.java
View File

@@ -192,6 +192,14 @@ public class CustomDialogHelper {
return this; return this;
} }
/**
* Sets message padding of the dialog.
*/
public CustomDialogHelper setMessagePadding(int dp) {
mDialogMessage.setPadding(dp, dp, dp, dp);
return this;
}
/** /**
* Sets icon of the dialog. * Sets icon of the dialog.
*/ */

6
packages/SettingsLib/tests/robotests/src/com/android/settingslib/users/CreateUserDialogControllerTest.java
View File

@@ -111,13 +111,13 @@ public class CreateUserDialogControllerTest {
mActivityStarter, true, null, mActivityStarter, true, null,
cancelCallback); cancelCallback);
dialog.show(); dialog.show();
assertThat(dialog.findViewById(R.id.user_info_scroll).getVisibility()).isEqualTo(View.GONE); assertThat(dialog.findViewById(R.id.user_info_editor).getVisibility()).isEqualTo(View.GONE);
Button next = dialog.findViewById(R.id.button_ok); Button next = dialog.findViewById(R.id.button_ok);
next.performClick(); next.performClick();
((RadioButton) dialog.findViewById(R.id.grant_admin_yes)).setChecked(true); ((RadioButton) dialog.findViewById(R.id.grant_admin_yes)).setChecked(true);
assertThat(dialog.findViewById(R.id.user_info_scroll).getVisibility()).isEqualTo(View.GONE); assertThat(dialog.findViewById(R.id.user_info_editor).getVisibility()).isEqualTo(View.GONE);
next.performClick(); next.performClick();
assertThat(dialog.findViewById(R.id.user_info_scroll).getVisibility()) assertThat(dialog.findViewById(R.id.user_info_editor).getVisibility())
.isEqualTo(View.VISIBLE); .isEqualTo(View.VISIBLE);
dialog.dismiss(); dialog.dismiss();
} }

35
packages/SettingsLib/tests/robotests/src/com/android/settingslib/users/EditUserInfoControllerTest.java
View File

@@ -27,7 +27,6 @@ import static org.mockito.Mockito.when;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
@@ -108,7 +107,7 @@ public class EditUserInfoControllerTest {
@Test @Test
public void photoControllerOnActivityResult_whenWaiting_isCalled() { public void photoControllerOnActivityResult_whenWaiting_isCalled() {
mController.createDialog(mActivity, mActivityStarter, mCurrentIcon, "test user", mController.createDialog(mActivity, mActivityStarter, mCurrentIcon, "test user",
"title", null, null); null, null);
mController.startingActivityForResult(); mController.startingActivityForResult();
Intent resultData = new Intent(); Intent resultData = new Intent();
mController.onActivityResult(0, 0, resultData); mController.onActivityResult(0, 0, resultData);
@@ -126,9 +125,7 @@ public class EditUserInfoControllerTest {
() -> String.valueOf('A')).limit(200).collect(Collectors.joining()); () -> String.valueOf('A')).limit(200).collect(Collectors.joining());
final AlertDialog dialog = (AlertDialog) mController.createDialog(mActivity, final AlertDialog dialog = (AlertDialog) mController.createDialog(mActivity,
mActivityStarter, mCurrentIcon, mActivityStarter, mCurrentIcon, "test user", null, null);
"test user", "title", null,
null);
dialog.show(); dialog.show();
final EditText userNameEditText = dialog.findViewById(R.id.user_name); final EditText userNameEditText = dialog.findViewById(R.id.user_name);
userNameEditText.setText(longName); userNameEditText.setText(longName);
@@ -143,7 +140,7 @@ public class EditUserInfoControllerTest {
AlertDialog dialog = (AlertDialog) mController.createDialog( AlertDialog dialog = (AlertDialog) mController.createDialog(
mActivity, mActivityStarter, mCurrentIcon, "test", mActivity, mActivityStarter, mCurrentIcon, "test",
"title", successCallback, cancelCallback); successCallback, cancelCallback);
dialog.show(); dialog.show();
dialog.cancel(); dialog.cancel();
@@ -159,9 +156,9 @@ public class EditUserInfoControllerTest {
AlertDialog dialog = (AlertDialog) mController.createDialog( AlertDialog dialog = (AlertDialog) mController.createDialog(
mActivity, mActivityStarter, mCurrentIcon, "test", mActivity, mActivityStarter, mCurrentIcon, "test",
"title", successCallback, cancelCallback); successCallback, cancelCallback);
dialog.show(); dialog.show();
dialog.getButton(Dialog.BUTTON_NEGATIVE).performClick(); dialog.findViewById(R.id.button_back).performClick();
verifyNoInteractions(successCallback); verifyNoInteractions(successCallback);
verify(cancelCallback, times(1)) verify(cancelCallback, times(1))
@@ -176,11 +173,11 @@ public class EditUserInfoControllerTest {
Drawable oldUserIcon = mCurrentIcon; Drawable oldUserIcon = mCurrentIcon;
AlertDialog dialog = (AlertDialog) mController.createDialog( AlertDialog dialog = (AlertDialog) mController.createDialog(
mActivity, mActivityStarter, oldUserIcon, "test", mActivity, mActivityStarter, oldUserIcon, "test",
"title", successCallback, cancelCallback); successCallback, cancelCallback);
// No change to the photo. // No change to the photo.
when(mController.getPhotoController().getNewUserPhotoDrawable()).thenReturn(null); when(mController.getPhotoController().getNewUserPhotoDrawable()).thenReturn(null);
dialog.show(); dialog.show();
dialog.getButton(Dialog.BUTTON_POSITIVE).performClick(); dialog.findViewById(R.id.button_ok).performClick();
verify(successCallback, times(1)) verify(successCallback, times(1))
.accept("test", oldUserIcon); .accept("test", oldUserIcon);
@@ -194,11 +191,11 @@ public class EditUserInfoControllerTest {
AlertDialog dialog = (AlertDialog) mController.createDialog( AlertDialog dialog = (AlertDialog) mController.createDialog(
mActivity, mActivityStarter, null, "test", mActivity, mActivityStarter, null, "test",
"title", successCallback, cancelCallback); successCallback, cancelCallback);
// No change to the photo. // No change to the photo.
when(mController.getPhotoController().getNewUserPhotoDrawable()).thenReturn(null); when(mController.getPhotoController().getNewUserPhotoDrawable()).thenReturn(null);
dialog.show(); dialog.show();
dialog.getButton(Dialog.BUTTON_POSITIVE).performClick(); dialog.findViewById(R.id.button_ok).performClick();
verify(successCallback, times(1)) verify(successCallback, times(1))
.accept("test", null); .accept("test", null);
@@ -212,14 +209,14 @@ public class EditUserInfoControllerTest {
AlertDialog dialog = (AlertDialog) mController.createDialog( AlertDialog dialog = (AlertDialog) mController.createDialog(
mActivity, mActivityStarter, mCurrentIcon, "test", mActivity, mActivityStarter, mCurrentIcon, "test",
"title", successCallback, cancelCallback); successCallback, cancelCallback);
// No change to the photo. // No change to the photo.
when(mController.getPhotoController().getNewUserPhotoDrawable()).thenReturn(null); when(mController.getPhotoController().getNewUserPhotoDrawable()).thenReturn(null);
dialog.show(); dialog.show();
String expectedNewName = "new test user"; String expectedNewName = "new test user";
EditText editText = (EditText) dialog.findViewById(R.id.user_name); EditText editText = (EditText) dialog.findViewById(R.id.user_name);
editText.setText(expectedNewName); editText.setText(expectedNewName);
dialog.getButton(Dialog.BUTTON_POSITIVE).performClick(); dialog.findViewById(R.id.button_ok).performClick();
verify(successCallback, times(1)) verify(successCallback, times(1))
.accept(expectedNewName, mCurrentIcon); .accept(expectedNewName, mCurrentIcon);
@@ -233,12 +230,12 @@ public class EditUserInfoControllerTest {
AlertDialog dialog = (AlertDialog) mController.createDialog( AlertDialog dialog = (AlertDialog) mController.createDialog(
mActivity, mActivityStarter, mCurrentIcon, "test", mActivity, mActivityStarter, mCurrentIcon, "test",
"title", successCallback, cancelCallback); successCallback, cancelCallback);
// A different drawable. // A different drawable.
Drawable newPhoto = mock(Drawable.class); Drawable newPhoto = mock(Drawable.class);
when(mController.getPhotoController().getNewUserPhotoDrawable()).thenReturn(newPhoto); when(mController.getPhotoController().getNewUserPhotoDrawable()).thenReturn(newPhoto);
dialog.show(); dialog.show();
dialog.getButton(Dialog.BUTTON_POSITIVE).performClick(); dialog.findViewById(R.id.button_ok).performClick();
verify(successCallback, times(1)) verify(successCallback, times(1))
.accept("test", newPhoto); .accept("test", newPhoto);
@@ -252,12 +249,12 @@ public class EditUserInfoControllerTest {
AlertDialog dialog = (AlertDialog) mController.createDialog( AlertDialog dialog = (AlertDialog) mController.createDialog(
mActivity, mActivityStarter, null, "test", mActivity, mActivityStarter, null, "test",
"title", successCallback, cancelCallback); successCallback, cancelCallback);
// A different drawable. // A different drawable.
Drawable newPhoto = mock(Drawable.class); Drawable newPhoto = mock(Drawable.class);
when(mController.getPhotoController().getNewUserPhotoDrawable()).thenReturn(newPhoto); when(mController.getPhotoController().getNewUserPhotoDrawable()).thenReturn(newPhoto);
dialog.show(); dialog.show();
dialog.getButton(Dialog.BUTTON_POSITIVE).performClick(); dialog.findViewById(R.id.button_ok).performClick();
verify(successCallback, times(1)) verify(successCallback, times(1))
.accept("test", newPhoto); .accept("test", newPhoto);
@@ -269,7 +266,7 @@ public class EditUserInfoControllerTest {
mPhotoRestrictedByBase = true; mPhotoRestrictedByBase = true;
mController.createDialog(mActivity, mActivityStarter, mCurrentIcon, mController.createDialog(mActivity, mActivityStarter, mCurrentIcon,
"test", "title", null, null); "test", null, null);
assertThat(mController.mPhotoController).isNull(); assertThat(mController.mPhotoController).isNull();
} }