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

Commit f483ed90 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am bdc26dc3: Merge "Change measurement of effective screen height for... 

am bdc26dc3: Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2

* commit 'bdc26dc3':
  Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.
parents f89ea7a5 bdc26dc3

core/java/android/widget/PopupWindow.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -1169,8 +1169,7 @@ public class PopupWindow { 
        int bottomEdge = displayFrame.bottom;

        int bottomEdge = displayFrame.bottom;

        if (ignoreBottomDecorations) {

        if (ignoreBottomDecorations) {

            Resources res = anchor.getContext().getResources();

            Resources res = anchor.getContext().getResources();

            bottomEdge = res.getDisplayMetrics().heightPixels -

            bottomEdge = res.getDisplayMetrics().heightPixels;

                    (int) res.getDimension(com.android.internal.R.dimen.screen_margin_bottom);

        }

        }

        final int distanceToBottom = bottomEdge - (anchorPos[1] + anchor.getHeight()) - yOffset;

        final int distanceToBottom = bottomEdge - (anchorPos[1] + anchor.getHeight()) - yOffset;

        final int distanceToTop = anchorPos[1] - displayFrame.top + yOffset;

        final int distanceToTop = anchorPos[1] - displayFrame.top + yOffset;

core/res/res/values-xlarge/dimens.xml

+0 −4
Original line number Original line Diff line number Diff line
@@ -25,10 +25,6 @@ 
    <!-- Size of the giant number (unread count) in the notifications -->

    <!-- Size of the giant number (unread count) in the notifications -->

    <dimen name="status_bar_content_number_size">48sp</dimen>

    <dimen name="status_bar_content_number_size">48sp</dimen>





    <!-- Margin at the edge of the screen to ignore touch events for in the windowshade. -->

    <!-- Margin for permanent screen decorations at the bottom. -->

    <dimen name="screen_margin_bottom">48dip</dimen>



    <!-- Default height of a key in the password keyboard for alpha -->

    <!-- Default height of a key in the password keyboard for alpha -->

    <dimen name="password_keyboard_key_height_alpha">75dip</dimen>

    <dimen name="password_keyboard_key_height_alpha">75dip</dimen>

    <!-- Default height of a key in the password keyboard for numeric -->

    <!-- Default height of a key in the password keyboard for numeric -->