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

Merge "Add padding to dialog" into udc-qpr-dev am: e992927655 am: 5aca5fbecd

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23710326

Change-Id: If3efd96d1b9fcfbffddae5b1fb83f0c961aa73b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tetiana Meronyk
2023-06-16 13:12:25 +00:00
committed by Automerger Merge Worker
parent f355bc2e01 5aca5fbecd
commit 21e17b746a
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/users/UserDetailsSettings.java
View File

@@ -79,6 +79,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
/** Whether to enable the app_copying fragment. */ /** Whether to enable the app_copying fragment. */
private static final boolean SHOW_APP_COPYING_PREF = false; private static final boolean SHOW_APP_COPYING_PREF = false;
private static final int MESSAGE_PADDING = 20;
private UserManager mUserManager; private UserManager mUserManager;
private UserCapabilities mUserCaps; private UserCapabilities mUserCaps;
@@ -274,6 +275,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
context.getDrawable(com.android.settingslib.R.drawable.ic_admin_panel_settings)); context.getDrawable(com.android.settingslib.R.drawable.ic_admin_panel_settings));
dialogHelper.setTitle(R.string.user_revoke_admin_confirm_title); dialogHelper.setTitle(R.string.user_revoke_admin_confirm_title);
dialogHelper.setMessage(R.string.user_revoke_admin_confirm_message); dialogHelper.setMessage(R.string.user_revoke_admin_confirm_message);
dialogHelper.setMessagePadding(MESSAGE_PADDING);
dialogHelper.setPositiveButton(R.string.remove, view -> { dialogHelper.setPositiveButton(R.string.remove, view -> {
updateUserAdminStatus(false); updateUserAdminStatus(false);
dialogHelper.getDialog().dismiss(); dialogHelper.getDialog().dismiss();
@@ -294,6 +296,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
context.getDrawable(com.android.settingslib.R.drawable.ic_admin_panel_settings)); context.getDrawable(com.android.settingslib.R.drawable.ic_admin_panel_settings));
dialogHelper.setTitle(com.android.settingslib.R.string.user_grant_admin_title); dialogHelper.setTitle(com.android.settingslib.R.string.user_grant_admin_title);
dialogHelper.setMessage(com.android.settingslib.R.string.user_grant_admin_message); dialogHelper.setMessage(com.android.settingslib.R.string.user_grant_admin_message);
dialogHelper.setMessagePadding(MESSAGE_PADDING);
dialogHelper.setPositiveButton(com.android.settingslib.R.string.user_grant_admin_button, dialogHelper.setPositiveButton(com.android.settingslib.R.string.user_grant_admin_button,
view -> { view -> {
updateUserAdminStatus(true); updateUserAdminStatus(true);