Merge "[Settings] Set title and message by String to make it more flexible." into main

1 files changed, 45 insertions, 2 deletions

diff --git a/packages/SettingsLib/src/com/android/settingslib/utils/CustomDialogHelper.java b/packages/SettingsLib/src/com/android/settingslib/utils/CustomDialogHelper.java
index 6e64c597f5cc..34e08af18f93 100644
--- a/packages/SettingsLib/src/com/android/settingslib/utils/CustomDialogHelper.java
+++ b/packages/SettingsLib/src/com/android/settingslib/utils/CustomDialogHelper.java
@@ -34,6 +34,8 @@ import com.android.settingslib.R;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
+import androidx.annotation.NonNull;
+
 /**
  * This class is used to create custom dialog with icon, title, message and custom view that are
  * horizontally centered.
@@ -191,20 +193,52 @@ public class CustomDialogHelper {
     }
 
     /**
+     * Sets title of the dialog by string.
+     */
+    @NonNull public CustomDialogHelper setTitle(@NonNull CharSequence title) {
+        mDialogTitle.setText(title);
+        return this;
+    }
+
+    /**
+     * Sets title padding of the dialog.
+     */
+    @NonNull public CustomDialogHelper setTitlePadding(int left, int top, int right, int bottom) {
+        mDialogTitle.setPadding(left, top, right, bottom);
+        return this;
+    }
+
+    /**
      * Sets message of the dialog.
      */
-    public CustomDialogHelper setMessage(@StringRes int resid) {
+   @NonNull public CustomDialogHelper setMessage(@StringRes int resid) {
         mDialogMessage.setText(resid);
         return this;
     }
 
     /**
+     * Sets message of the dialog by string.
+     */
+    @NonNull public CustomDialogHelper setMessage(@NonNull CharSequence message) {
+        mDialogMessage.setText(message);
+        return this;
+    }
+
+    /**
      * Sets message padding of the dialog.
      */
-    public CustomDialogHelper setMessagePadding(int dp) {
+    @NonNull public CustomDialogHelper setMessagePadding(int dp) {
         mDialogMessage.setPadding(dp, dp, dp, dp);
         return this;
     }
+    /**
+     * Sets message padding of the dialog.
+     */
+    @NonNull
+    public CustomDialogHelper setMessagePadding(int left, int top, int right, int bottom) {
+        mDialogMessage.setPadding(left, top, right, bottom);
+        return this;
+    }
 
     /**
      * Sets icon of the dialog.
@@ -215,6 +249,15 @@ public class CustomDialogHelper {
     }
 
     /**
+     * Sets icon padding of the dialog.
+     */
+    @NonNull
+    public CustomDialogHelper setIconPadding(int left, int top, int right, int bottom) {
+        mDialogIcon.setPadding(left, top, right, bottom);
+        return this;
+    }
+
+    /**
      * Removes all views that were previously added to the custom layout part.
      */
     public CustomDialogHelper clearCustomLayout() {