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

Commit fee3fc5b authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Framework: Fix button label toasts when layout is RTL" into cm-10.1

parents 11ee1823 3578a79f

core/java/android/app/MediaRouteButton.java

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ public class MediaRouteButton extends View { 
        Toast cheatSheet = Toast.makeText(context, contentDesc, Toast.LENGTH_SHORT);

        if (midy < displayFrame.height()) {

            // Show along the top; follow action buttons

            cheatSheet.setGravity(Gravity.TOP | Gravity.END,

            cheatSheet.setGravity(Gravity.TOP | Gravity.RIGHT,

                    screenWidth - screenPos[0] - width / 2, height);

        } else {

            // Show along the bottom center

core/java/com/android/internal/view/menu/ActionMenuItemView.java

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ public class ActionMenuItemView extends TextView 
        Toast cheatSheet = Toast.makeText(context, mItemData.getTitle(), Toast.LENGTH_SHORT);

        if (midy < displayFrame.height()) {

            // Show along the top; follow action buttons

            cheatSheet.setGravity(Gravity.TOP | Gravity.END,

            cheatSheet.setGravity(Gravity.TOP | Gravity.RIGHT,

                    screenWidth - screenPos[0] - width / 2, height);

        } else {

            // Show along the bottom center