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

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

Browse Source 
* commit '2e030285824780cae85c0ef7b77fcde050c35208':
  Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3.
This commit is contained in:
Yohei Yukawa
2015-07-16 03:59:27 +00:00
committed by Android Git Automerger
parent 73c8a19d42 2e03028582
commit 66b8377e88
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);
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
// specify the popup poision in screen coordinates.
mParent.getLocationOnScreen(mParentPositionOnScreen);
@@ -519,6 +522,10 @@ public final class FloatingToolbar {
cancelOverflowAnimations();
refreshCoordinatesAndOverflowDirection(contentRectOnScreen);
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.
// TODO: Consider to use PopupWindow.setLayoutInScreenEnabled(true) so that we can
// specify the popup poision in screen coordinates.