Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7768fd2f authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

am bf80d273: am 74890242: Merge "Don\'t override dialog icon drawable unless... 

am bf80d273: am 74890242: Merge "Don\'t override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev
automerge: 74882cb0

* commit '74882cb0':
  Don't override dialog icon drawable unless valid resource ID was set
parents afeb044a 74882cb0

core/java/android/app/AlertDialog.java

+7 −1
Original line number Original line Diff line number Diff line
@@ -466,6 +466,8 @@ public class AlertDialog extends Dialog implements DialogInterface { 
        

        

        /**

        /**

         * Set the resource id of the {@link Drawable} to be used in the title.

         * Set the resource id of the {@link Drawable} to be used in the title.

         * <p>

         * Takes precedence over values set using {@link #setIcon(Drawable)}.

         *

         *

         * @return This Builder object to allow for chaining of calls to set methods

         * @return This Builder object to allow for chaining of calls to set methods

         */

         */
@@ -485,7 +487,11 @@ public class AlertDialog extends Dialog implements DialogInterface { 
        }

        }





        /**

        /**

         * Set an icon as supplied by a theme attribute. e.g. android.R.attr.alertDialogIcon

         * Set an icon as supplied by a theme attribute. e.g.

         * {@link android.R.attr#alertDialogIcon}.

         * <p>

         * Takes precedence over values set using {@link #setIcon(int)} or

         * {@link #setIcon(Drawable)}.

         *

         *

         * @param attrId ID of a theme attribute that points to a drawable resource.

         * @param attrId ID of a theme attribute that points to a drawable resource.

         */

         */

core/java/com/android/internal/app/AlertController.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -955,10 +955,10 @@ public class AlertController { 
                if (mIcon != null) {

                if (mIcon != null) {

                    dialog.setIcon(mIcon);

                    dialog.setIcon(mIcon);

                }

                }

                if (mIconId >= 0) {

                if (mIconId != 0) {

                    dialog.setIcon(mIconId);

                    dialog.setIcon(mIconId);

                }

                }

                if (mIconAttrId > 0) {

                if (mIconAttrId != 0) {

                    dialog.setIcon(dialog.getIconAttributeResId(mIconAttrId));

                    dialog.setIcon(dialog.getIconAttributeResId(mIconAttrId));

                }

                }

            }

            }