Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c37b7922: am 66b8377e: am 2e030285: am ebbe7706: Merge "Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3." into mnc-dev

Browse Source 
* commit 'c37b7922f1839f845503ecc58349dafc06586bee':
  Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3.
This commit is contained in:
Yohei Yukawa
2015-07-16 04:26:19 +00:00
committed by Android Git Automerger
parent 6baa88d5d3 c37b7922f1
commit 5301bd7274
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/com/android/internal/widget/FloatingToolbar.java
View File

@@ -450,7 +450,10 @@ public final class FloatingToolbar {
} }
refreshCoordinatesAndOverflowDirection(contentRectOnScreen); refreshCoordinatesAndOverflowDirection(contentRectOnScreen);
preparePopupContent(); preparePopupContent();
// We need to specify the offset relative to mParent. // PopupWindow#showAtLocation() receives the location relative to the attached window
// hence the following code is correct when and only when mParent is aligned to the
// top-left of the attached window.
// TODO: Fix the following logic so that mParent can be placed at anywhere.
// TODO: Consider to use PopupWindow.setLayoutInScreenEnabled(true) so that we can // TODO: Consider to use PopupWindow.setLayoutInScreenEnabled(true) so that we can
// specify the popup poision in screen coordinates. // specify the popup poision in screen coordinates.
mParent.getLocationOnScreen(mParentPositionOnScreen); mParent.getLocationOnScreen(mParentPositionOnScreen);
@@ -519,6 +522,10 @@ public final class FloatingToolbar {
cancelOverflowAnimations(); cancelOverflowAnimations();
refreshCoordinatesAndOverflowDirection(contentRectOnScreen); refreshCoordinatesAndOverflowDirection(contentRectOnScreen);
preparePopupContent(); preparePopupContent();
// PopupWindow#update() receives the location relative to the attached window hence
// the following code is correct when and only when mParent is aligned to the top-left
// of the attached window.
// TODO: Fix the following logic so that mParent can be placed at anywhere.
// We need to specify the offset relative to mParent. // We need to specify the offset relative to mParent.
// TODO: Consider to use PopupWindow.setLayoutInScreenEnabled(true) so that we can // TODO: Consider to use PopupWindow.setLayoutInScreenEnabled(true) so that we can
// specify the popup poision in screen coordinates. // specify the popup poision in screen coordinates.