drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'bdc26dc34a5d848883d5acdee62f5b4403e8fe04':
  Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.
This commit is contained in:
Adam Powell
2011-05-20 16:02:21 -07:00
committed by Android Git Automerger
parent f89ea7a5ec bdc26dc34a
commit f483ed9040
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/widget/PopupWindow.java
View File

@ -1169,8 +1169,7 @@ public class PopupWindow {
int bottomEdge = displayFrame.bottom;
if (ignoreBottomDecorations) {
Resources res = anchor.getContext().getResources();
bottomEdge = res.getDisplayMetrics().heightPixels -
(int) res.getDimension(com.android.internal.R.dimen.screen_margin_bottom);
bottomEdge = res.getDisplayMetrics().heightPixels;
}
final int distanceToBottom = bottomEdge - (anchorPos[1] + anchor.getHeight()) - yOffset;
final int distanceToTop = anchorPos[1] - displayFrame.top + yOffset;

4
core/res/res/values-xlarge/dimens.xml
View File

@ -25,10 +25,6 @@
<!-- Size of the giant number (unread count) in the notifications -->
<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 -->
<dimen name="password_keyboard_key_height_alpha">75dip</dimen>
<!-- Default height of a key in the password keyboard for numeric -->