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

Commit 15e7b2ac authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Translate compound button drawable by scroll position" into lmp-dev

parents 5d604181 b95c336d

core/java/android/widget/CompoundButton.java

+9 −1
Original line number Diff line number Diff line
@@ -398,7 +398,15 @@ public abstract class CompoundButton extends Button implements Checkable { 
        super.onDraw(canvas);



        if (buttonDrawable != null) {

            final int scrollX = mScrollX;

            final int scrollY = mScrollY;

            if (scrollX == 0 && scrollY == 0) {

                buttonDrawable.draw(canvas);

            } else {

                canvas.translate(scrollX, scrollY);

                buttonDrawable.draw(canvas);

                canvas.translate(-scrollX, -scrollY);

            }

        }

    }

core/res/res/layout/select_dialog_item_material.xml

+2 −2
Original line number Diff line number Diff line
@@ -28,6 +28,6 @@ 
    android:textAppearance="?android:attr/textAppearanceListItemSmall"

    android:textColor="?android:attr/textColorAlertDialogListItem"

    android:gravity="center_vertical"

    android:paddingStart="16dip"

    android:paddingEnd="16dip"

    android:paddingStart="@dimen/alert_dialog_padding_material"

    android:paddingEnd="@dimen/alert_dialog_padding_material"

    android:ellipsize="marquee" />

core/res/res/layout/select_dialog_multichoice_material.xml

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
    android:textAppearance="?android:attr/textAppearanceMedium"

    android:textColor="?android:attr/textColorAlertDialogListItem"

    android:gravity="center_vertical"

    android:paddingStart="16dip"

    android:paddingEnd="16dip"

    android:paddingStart="@dimen/alert_dialog_padding_material"

    android:paddingEnd="@dimen/alert_dialog_padding_material"

    android:checkMark="?android:attr/listChoiceIndicatorMultiple"

    android:checkMarkGravity="start"

    android:ellipsize="marquee" />

core/res/res/layout/select_dialog_singlechoice_material.xml

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
    android:textAppearance="?android:attr/textAppearanceMedium"

    android:textColor="?android:attr/textColorAlertDialogListItem"

    android:gravity="center_vertical"

    android:paddingStart="16dip"

    android:paddingEnd="16dip"

    android:paddingStart="@dimen/alert_dialog_padding_material"

    android:paddingEnd="@dimen/alert_dialog_padding_material"

    android:checkMark="?android:attr/listChoiceIndicatorSingle"

    android:checkMarkGravity="start"

    android:ellipsize="marquee" />