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

Commit a93347a6 authored by Adam Powell's avatar Adam Powell
Browse files

Dialog-o-rama! 

New styling for Holo dialogs. Now 76% easier for apps to create
dialog-based layouts! (Less tricky padding and margin rules)

Cancelable AlertDialogs now are canceled when the user touches
outside.

Dialogs in landscape mode will try not to fill the width of the
screen.

Change-Id: I621b5a19780883ee703a8492510451b480a0b8cc
parent 46d6bcfb

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -1632,6 +1632,7 @@ package android { 
    field public static final int Widget_Holo_AutoCompleteTextView = 16973968; // 0x1030090

    field public static final int Widget_Holo_Button = 16973963; // 0x103008b

    field public static final int Widget_Holo_Button_Borderless = 16974050; // 0x10300e2

    field public static final int Widget_Holo_Button_Borderless_Small = 16974107; // 0x103011b

    field public static final int Widget_Holo_Button_Inset = 16973965; // 0x103008d

    field public static final int Widget_Holo_Button_Small = 16973964; // 0x103008c

    field public static final int Widget_Holo_Button_Toggle = 16973966; // 0x103008e
@@ -1658,6 +1659,7 @@ package android { 
    field public static final int Widget_Holo_Light_ActionMode = 16974047; // 0x10300df

    field public static final int Widget_Holo_Light_AutoCompleteTextView = 16974011; // 0x10300bb

    field public static final int Widget_Holo_Light_Button = 16974006; // 0x10300b6

    field public static final int Widget_Holo_Light_Button_Borderless_Small = 16974108; // 0x103011c

    field public static final int Widget_Holo_Light_Button_Inset = 16974008; // 0x10300b8

    field public static final int Widget_Holo_Light_Button_Small = 16974007; // 0x10300b7

    field public static final int Widget_Holo_Light_Button_Toggle = 16974009; // 0x10300b9

core/java/android/app/AlertDialog.java

+1 −1
Original line number Diff line number Diff line
@@ -890,7 +890,7 @@ public class AlertDialog extends Dialog implements DialogInterface { 
        public AlertDialog create() {

            final AlertDialog dialog = new AlertDialog(P.mContext, mTheme, false);

            P.apply(dialog.mAlert);

            dialog.setCancelable(P.mCancelable);

            dialog.setCanceledOnTouchOutside(P.mCancelable);

            dialog.setOnCancelListener(P.mOnCancelListener);

            if (P.mOnKeyListener != null) {

                dialog.setOnKeyListener(P.mOnKeyListener);

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

+6 −2
Original line number Diff line number Diff line
@@ -575,10 +575,14 @@ public class AlertController { 
        params.weight = 0.5f;

        button.setLayoutParams(params);

        View leftSpacer = mWindow.findViewById(R.id.leftSpacer);

        if (leftSpacer != null) {

            leftSpacer.setVisibility(View.VISIBLE);

        }

        View rightSpacer = mWindow.findViewById(R.id.rightSpacer);

        if (rightSpacer != null) {

            rightSpacer.setVisibility(View.VISIBLE);

        }

    }



    private void setBackground(LinearLayout topPanel, LinearLayout contentPanel,

            View customPanel, boolean hasButtons, TypedArray a, boolean hasTitle,

core/java/com/android/internal/widget/DialogTitle.java

+7 −3
Original line number Diff line number Diff line
@@ -54,15 +54,19 @@ public class DialogTitle extends TextView { 
                if (ellipsisCount > 0) {

                    setSingleLine(false);

                    

                    TypedArray a = mContext.obtainStyledAttributes(

                            android.R.style.TextAppearance_Medium,

                            android.R.styleable.TextAppearance);

                    TypedArray a = mContext.obtainStyledAttributes(null,

                            android.R.styleable.TextAppearance,

                            android.R.attr.textAppearanceMedium,

                            android.R.style.TextAppearance_Medium);

                    final int textSize = a.getDimensionPixelSize(

                            android.R.styleable.TextAppearance_textSize,

                            (int) (20 * getResources().getDisplayMetrics().density));

                    final int textColor = a.getColor(

                            android.R.styleable.TextAppearance_textColor, 0xffffffff);



                    // textSize is already expressed in pixels

                    setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);

                    setTextColor(textColor);

                    setMaxLines(2);

                    super.onMeasure(widthMeasureSpec, heightMeasureSpec);      

                }

core/res/res/drawable-hdpi/dialog_bottom_holo_dark.9.png

−209 B (846 B)
Loading image diff...